diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-05-03 17:27:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-05-03 17:27:34 +1000 |
| commit | 44a2f39e611ac0bc1f17c288a583d7f2e5684aa7 (patch) | |
| tree | 7bdf0b40da5a84aa8a221a0393fbab3b028d64b0 | |
| parent | b5f8c76ae260f8bef1846754ba50dc8be84e6992 (diff) | |
| download | linux-next-20220503.tar.gz linux-next-20220503.tar.xz | |
Add linux-next specific files for 20220503next-20220503
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 348 | ||||
| -rw-r--r-- | Next/Trees | 350 | ||||
| -rw-r--r-- | Next/merge.log | 12067 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 12766 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..45516fe6e5cb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,348 @@ +Name SHA1 +---- ---- +origin 9050ba3a61a4b5bd84c2cde092a100404f814f31 +fixes d06c942efea40e1701ade200477a7449008d9f24 +mm-hotfixes 10663622a1e584c547146d5b0725b6d2d2f406c9 +kbuild-current 3123109284176b1532874591f7c81f3837bbdc17 +arc-current c6ed4d84a2c49de7d6f490144cca7b4a4831fb6e +arm-current 9be4c88bb7924f68f88cfd47d925c2d046f51a73 +arm64-fixes c35fe2a68f29a0bda15ae994154cacaae5f69791 +arm-soc-fixes adee8aa22a9298148b3f86a83a7940e7a3329ad9 +drivers-memory-fixes 73039c6c7f36f90391626222438f5f32742e959e +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 0d52a01a266ba21840c7cb02e1de39c503759dda +powerpc-fixes bb82c574691daf8f7fa9a160264d15c5804cb769 +s390-fixes b5d1274409d0eec6d826f65d6dafebf9d77a1b99 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 79396934e289dbc501316c1d1f975bb4c88ae460 +bpf a0df71948e9548de819a6f1da68f5f1742258a52 +ipsec 79396934e289dbc501316c1d1f975bb4c88ae460 +netfilter 05ae2fba821c4d122ab4ba3e52144e21586c4010 +ipvs 05ae2fba821c4d122ab4ba3e52144e21586c4010 +wireless bb300130e47fcefbe938f06dbacaef0312e28416 +rdma-fixes 570a4bf7440e9fb2a4164244a6bf60a46362b627 +sound-current eb9d84b0ffe39893cb23b0b6712bbe3637fa25fa +sound-asoc-fixes 3a129880c5de23427510dbc4d01ad5f0e46a37c8 +regmap-fixes 3123109284176b1532874591f7c81f3837bbdc17 +regulator-fixes dfd2b37edf7ef469574ef7f36e3a1905ac9ead62 +spi-fixes 8868c03f3ca584abec7bb53d6c3f7c5ab6b60949 +pci-current 92597f97a40bf661bebceb92e26ff87c76d562d4 +driver-core.current 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +tty.current 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +usb.current 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes e23e50e7acc8d8f16498e9c129db33e6a00e80eb +phy 2c8045d48dee703ad8eab2be7d6547765a89c069 +staging.current ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +iio-fixes fe18894930a025617114aa8ca0adbf94d5bffe89 +counter-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +char-misc.current 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +soundwire-fixes 3123109284176b1532874591f7c81f3837bbdc17 +thunderbolt-fixes 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +input-current 4352e23a7ff2f8a4ff229dd1283ed2f2b708ec51 +crypto-current aa8e73eed7d3084c18dd16d195748661c7e881b5 +vfio-fixes 1ef3342a934e235aca72b4bcc0d6854d80a65077 +kselftest-fixes e8f0c89659323f3ddf60dcedcd56fe3ac36a37bf +modules-fixes dc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c +dmaengine-fixes 9889fc4f19e005b258196d801a097b9ca0252683 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes ba7542eb2dd5dfc75c457198b88986642e602065 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d4cb77112c7b654d9e95c45b1871b18fe1a62f31 +reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9 +mips-fixes f0a6c68f69981214cb7858738dd2bc81475111f7 +at91-fixes 0c640d9544d0109da3889d71ae77301e556db977 +omap-fixes 46ff3df87215ff42c0cd2c4bdb7d74540384a69c +kvm-fixes f751d8eac17692905cdd6935f72d523d8adf3b65 +kvms390-fixes 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +hwmon-fixes 08da09f028043fed9653331ae75bc310411f72e6 +nvdimm-fixes d28820419ca332f856cdf8bef0cafed79c29ed05 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes e4a747ad6e40f6d72f356af660e60bce2b376dfa +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes eb2fd9b43fae0c51982ac4229535b6cfd77380db +samsung-krzk-fixes 436ce66003d5020ca02cd096761d3214e9a91d82 +pinctrl-samsung-fixes ac875df4d854ab13d9c4af682a1837a1214fecec +devicetree-fixes e17fd4bf54fb579d03566ab22a02dc03b36f4d06 +scsi-fixes 8be70a842f70c0fe8e00fd488b1966344fa10ff4 +drm-fixes 9d9f720733b7e8d11e4cc53b53f461b117dab839 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f7e1089f43761ca221914aea9a755b23dc7cbc33 +mmc-fixes 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 3123109284176b1532874591f7c81f3837bbdc17 +hyperv-fixes eaa03d34535872d29004cb5cf77dc9dec1ba9a25 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes c6fe81191bd74f7e6ae9ce96a4837df9485f3ab8 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 3123109284176b1532874591f7c81f3837bbdc17 +spdx 3123109284176b1532874591f7c81f3837bbdc17 +gpio-brgl-fixes e5f6e5d554ac274f9c8ba60078103d0425b93c19 +gpio-intel-fixes 0c2cae09a765b1c1d842eb9328982976ec735926 +pinctrl-intel-fixes 0be0b70df6611205ac392d0e21f7e077f3230ee6 +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 02c7efa43627163e489a8db87882445a0ff381f7 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 4d5004451ab2218eab94a30e1841462c9316ba19 +irqchip-fixes 544808f7e21cb9ccdb8f3aa7de594c05b1419061 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 8013d1d3d2e33236dee13a133fba49ad55045e79 +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes dc3ae06c5f2170d879ff58696f629d8c3868aec3 +kbuild 3eb85539032fc019442474b9c1c017b6bdc7e371 +perf e0c1b8f9eba88173b30ba42eb492fd20582cf376 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 3cb4503a330159dc5cf2f8382181ccbabbbaa5b2 +asm-generic fba2689ee77e63b05e203b3f26079ef915e55660 +arc 6aa98f6217861889523e38b0141c8c71b2ef8a83 +arm 012d2fb6c8c90adac502c0bb9abd3e815f6047ca +arm64 c3adaa5c5c55fbd0c1f83110ed2cc2699366e094 +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc d8c5d0d2d566015977f034ea484aac883ee0f6c0 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic ed532523b4584a400739ecc61b5048ef8e7042a2 +aspeed d9540eeaa3d15d8295895fc39e7fb90937623923 +at91 0c640d9544d0109da3889d71ae77301e556db977 +drivers-memory d2fd434f2e1cc956e88ce13a343e79397931e176 +imx-mxs 08021731ef7af2b2095f67bb1302bfe5d5baa97e +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 54715794cbcd2d0f2ca03ef63ac0ac447e75ed8c +mvebu 8885ae5142a487ef283aff2ec46e55c0528c75f8 +omap 930161749e6491714f881212c953d69f0ba3b034 +qcom 0b3dd1e94ac06cb54398b31e903755cdc1f4ff99 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas f8a7df6a1a0408a9806441267173f0691e49f897 +reset 25459cf3225584c987119b3c76f26409bebc98dc +rockchip 7aa1e0349129903e603286c55cc11fbcc80b1565 +samsung-krzk 96a93983e53878f26219f67a02f9f0911df628bd +scmi d291310bcf58008293dcd97131935983d6d82380 +stm32 1a43e9b281c6eaadf788c3bfff3062860ced8e87 +sunxi 737a9ba0eeb8f179c6f34f2bbd5a79396f59241c +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 59ac218540e9aeb0b2220dacf0791bcf5073dae2 +ti 720b32f0f7bcaa8827e8349d3be0b94a3a8d8276 +xilinx 3123109284176b1532874591f7c81f3837bbdc17 +clk b473708bf4b50fc5abb600e856b73322b76d1c3b +clk-imx 43896f56b59eeaf08687fa976257ae7083d01b41 +clk-renesas 0ab55cf1834177a2162757fee2ac3cb6730beb20 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky c5acdf12cc24d34ea3f9426472dcb3f5d581b1e5 +m68k a96e4ebf3dedaf110999189939cd0272d32c4296 +m68knommu 2954225f14843124745b0801db5c631c9159737c +microblaze 78b5f52ab6f6074a6fe2f27122e2165f32d6a143 +mips 7671f9674b474505de289b548206ef48b0f5ceac +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd e34799ccc1269c2789e8ffd50d6d2260d3d31f78 +powerpc ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v d26eee72d9b9048ba8621e3d47553792729db01f +s390 aed80953c8f629d87f58e200a951d4090ae57100 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 82017457957a550d7d00dde419435dd74a890887 +xtensa 7f9c974174812908747fd26844e6ee479afc8826 +pidfd 0014edaedfd804dbf35b009808789325ca615716 +fscrypt a7a5bc5fe8acc9381e38a34ef18f1115c5c22079 +fscache 3123109284176b1532874591f7c81f3837bbdc17 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs ee13d3e828685106f4ab0b8b5aaefdc8a829a7df +ceph 7acae6183cf37c48b8da48bbbdb78820fb3913f3 +cifs 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 011c045788edeb4aabb326fab459efbcaa1e8c03 +exfat 1d404b899e322a3fed5d7af243d83bb9e71b1b78 +ext3 cfb73d370782eead3cc353317ea5e88bcd5e1636 +ext4 23e3d7f7061f8682c751c46512718f47580ad8f0 +f2fs 6daa83cbee0d1ac644262b2841a518c199a1908d +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 6b49bc9d8a5fe64369680f821b8788ec08d4470c +gfs2 db0c1968e93514ac84cb5116d7e56af51d21c210 +jfs 0d4837fdb796f99369cf7691d33de1b856bcaf1f +ksmbd 22da5264abf497a10a4ed629f07f4ba28a7ed5eb +nfs 00c94ebec5925593c0377b941289224469e72ac7 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd 5c2cb383394018ec6f18ebd2b7000c14e4f7ff9e +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs 705757274599e2e064dd3054aabc74e8af31a095 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs a44a027a8b2a20fec30e0e9c99b0eb41c03e7420 +zonefs 31a644b3c2ae6d0c47e84614ded3ce9bef1adb7a +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs fd78f28f9f506cf389614d8c4296837274cb61d2 +printk bfc1f2749c23a4748dc4993df37cf75fa2602aba +pci 9507c62158a670b73dff18b9d8fe317289cafa62 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid eb3f85f0fc6e1a06e98cb5a28d07c125f85f95f7 +i2c 05b42eff61a5224301432c5b01e28b45a00248df +i3c 6cbf8b38dfe3aabe330f2c356949bc4d6a1f034f +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 260c272ce947bcc5bcfe57d11082e77b719728b0 +jc_docs 81c653659d34ec253fba7f5d0f430813fe0f643d +v4l-dvb 3d59142ad94cf60b94b3dc94c19fdafa23aec8b1 +v4l-dvb-next 6c1c1eb8c87de221051b9198d40971640060842f +pm d3fa656ae5f38da2890e3c0d538b397d9afacea2 +cpufreq-arm a3b8d1b12c6bc3655332f19af84d0780ba88a578 +cpupower 3123109284176b1532874591f7c81f3837bbdc17 +devfreq 5d521a307526871f5613d24a8e71babf1869c486 +opp 3e1fac9324f8feaeffc724fd9aca7709caa6d3cc +thermal c07a7c8dbcd8e0e31446f10235108aef1f6d03ce +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 8e51ec6146fdec82f7308f89113497631013f16a +rdma ff815a89398d8bbfdc14ced98252bdae92126225 +net-next 0530a683fc858aa641d88ad83315ea53c27bce10 +bpf-next 20b87e7c29dffcfa3f96f2e99daec84fd46cabdb +ipsec-next 6e28f56c0d1d976a4940d13d7f27e446ce65cd0a +mlx5-next 2984287c4c19949d7eb451dcad0bd5c54a2a376f +netfilter-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176 +ipvs-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176 +bluetooth a99a4899aae6d5f2f868215f46509d260bf3bbf3 +wireless-next 0d3b26c4b97ae1a561070a973f0b2086e3644d1a +mtd 43823c5c56f247cfc028bf90299f675dd29abf88 +nand 079d6348f3be114f977b5b2e18174044eef6f1d3 +spi-nor 5ad784d990ac5d9b3ee74c637bc835501df1ff87 +crypto 11aeb93089ce0bf12ef79fe4d05fde075275e125 +drm 15e2b419a83777ef652bf5f0ea4385ef7711f710 +drm-misc 3fa50896c35982afb59ad5bcbe04ec2e91bb54a5 +amdgpu 3da2c38231a4c62dafdbd762a199cfacaccd0533 +drm-intel c140915c00c92e3ca2a4f8e5748f0b9ef3e5a418 +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 78f815c1cf8fc5f05dc5cec29eb1895cb53470e9 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev f443e374ae131c168a065ea1748feac6b2e76613 +regmap d640947562cea6158df13fe021b0e117865ba8b3 +sound 011b559be832194f992f73d6c0d5485f5925a10b +sound-asoc 180e66c028cbce98f297962db188965efc7546d7 +modules eb28e156bfd4119d94c7dc15c15ca01a5a96523d +input b243018eafeb69bf074ef013c54504632fd161ec +block e74c4a875ad8d789c06ebdbf824e67f7ba435581 +device-mapper e7ea9556985fd89c9c6627f1903b37b6430e4652 +libata 0cb63670d5052767391e3e1df51ebbffef8b6420 +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc ac9d25557dcc9fe90ed12bfbb6db401e892ca004 +mfd 3474b838f4204c21d108183d9268611d961a428f +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery 3123109284176b1532874591f7c81f3837bbdc17 +regulator dae0104737851d0fb6a6df8f2feaf690b6a95b7b +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 891163adf180bc369b2f11c9dfce6d2758d2a5bd +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6a9e261cbbee08c499f2331910027e8c40c8f81f +smack ba6b652bd8633bc90390e1a02ae0c743ea00c429 +tomoyo 3a321335572d49f6702dfc7fa7952264b81aac0c +tpmdd fad7eba9464e58146ccc458afcf6f0667b5b27f8 +watchdog 672c0c5173427e6b3e2a9bbb7be51ceeec78093a +iommu 85613addc0beca0e44ee1af3abaaef0927ba88cb +audit 3123109284176b1532874591f7c81f3837bbdc17 +devicetree 4fb74186cee8a7926f4d7264b4f257e158b0b161 +mailbox 1b0d0f7c12d57763fe27200d0569c863f11d2b8a +spi 4b939e3a3e9121c2fe1d2d609a4a02ba41283bd9 +tip aea1ae1ab93e60b266453b008238fbc5f0c65865 +clockevents 49c14f94ccfed1acf55a7dd592c00c58d38e5812 +edac cd2ef50eb483541975533484117ebec468f39f4a +irqchip 4bde53ab3370bfd377eff27152da36be9784e4f5 +ftrace c87857e214862a125208a4b1a510839d0c5a1bd4 +rcu 4ccb27d8a0f234aef439d44865d51218ab51eb5a +kvm 71d7c575a673d42ad7175ad5fc27c85c80330311 +kvm-arm 4e6921a2e6c1eb8f947b88b5f9313057091e911a +kvms390 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +xen-tip 533bec143a4c32f7b2014a159d0f5376226e5b4d +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues 10a5a651e3afc9b0b381f47e8930972e4e918397 +drivers-x86 b0c07116c894325d40a218f558047f925e4b3bdb +chrome-platform 57b888ca2541785de2fcb90575b378921919b6c0 +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds 3123109284176b1532874591f7c81f3837bbdc17 +ipmi 8d190578f3268ab38283826eb4b8cf713d608890 +driver-core 0e509f537f8ddd89f237e62f77818dbdbc8be395 +usb c40b62216c1aecc0dc00faf33d71bd71cb440337 +thunderbolt 5dddb41692849594862473e4ddf57fb52e1249d6 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 3123109284176b1532874591f7c81f3837bbdc17 +tty 9e6a90790357e8b468445f5c549c498126cedefb +char-misc 35a7609639c49f76f13f206402cbf692c4ae3e4e +coresight c86dd9869128156696b4482b2a073790d3db2cfb +fpga eee1071ee7df49f712dd9b6f13f7ac16649e4b13 +icc 2c16d1b0fc5f2b696d0a38399652c52933aeb0b3 +iio eda75f8238b079a41aa11383bd47dc3297e74cb1 +phy-next bc055a50a8594a634e09a7286601d0d2bd51c734 +soundwire 60657fb9b19d4ff310bdebfd1fd5a075678c29fb +extcon ef799ab8dc5c8b8c5fe7d4019a9e73ca0b085474 +gnss 3123109284176b1532874591f7c81f3837bbdc17 +vfio 676d7cda1a3c19872428a9bc818577a1aafafdd5 +staging 5fe7856ad59afc56a6ff35d091bfaddd1d4f4bce +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 99faef48e7a3f878848a2d711af710e36fadbd6e +cgroup 5c26993c31f0f726aa1f90158f17ec95069b7cb2 +scsi a576d58bd4ac45b9de34d7538998c4ca60863ee9 +scsi-mkp f304d35e59958ea4be399f78e5be08d4a0c4db75 +vhost 1c80cf031e0204fde471558ee40183695773ce13 +rpmsg e8d9d4560c51b415bdeab44ef7a691bcb4489088 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 30a35c07d9e9affaebd557c454df98e5ba269776 +gpio-intel edc5601db66411a8c9c6b08b3aacf7e154a34c6d +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl a985730491d1096817831ba3a9b859022b5281ee +pinctrl-intel 0be0b70df6611205ac392d0e21f7e077f3230ee6 +pinctrl-renesas f7bc5f52d2354b41d5a111942be7ee01e5560c78 +pinctrl-samsung ac875df4d854ab13d9c4af682a1837a1214fecec +pwm 2bf8ee0faa988b5cec3503ebf2f970a0e84d24ee +userns 9def41809e95d345875f37d2245b4b17c62fedf1 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest c7b607fa9325ccc94982774c505176677117689c +livepatching 0e1b951d6de0528a81d119634ad23f8f9fb6d423 +rtc 3123109284176b1532874591f7c81f3837bbdc17 +nvdimm d43fae7c4d3e6dfee9d26287907dbe8e27ff8846 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb e9d0fa5e2482d08f079861a03c9f40a47dacfcb0 +seccomp 662340ef921828507c931da6db303fa3cb02228e +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 54bf672111eef18819fa6e562f68b2d6c449b05d +nvmem 0f07cbb92a28894a58fb70fc49e37de8e855eda8 +xarray 63b1898fffcd8bd81905b95104ecc52b45a97e21 +hyperv 455880dfe292a2bdd3b4ad6a107299fce610e64b +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 3123109284176b1532874591f7c81f3837bbdc17 +kunit 3123109284176b1532874591f7c81f3837bbdc17 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 38289a26e1b8a37755f3e07056ca416c1ee2a2e8 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi aa5c73d9296d35aadea654b67f96dfe6c8203a06 +memblock 58ffc34896db2e5e49e6ae6bf8042f85504d84e8 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 280302f0e8f6919f0c591753ea21906d77797746 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 736e0f2179d3005d994ab5addd282988de2e4615 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 6b2d727295817abef9351a88392f031720af88f3 +random eb3f5d23695be6e2399fa1eb809f16db20b268ac +landlock 3123109284176b1532874591f7c81f3837bbdc17 +rust 011150424cd9db6089d9a3732a03a6d39ce6f1c9 +sysctl a467257ffe4bdb13eacddec0137013f6a1140b81 +folio 5d57547411714cfbc67e52eb9af069d2a101e8bc +execve 70578ff3367dd4ad8f212a9b5c05cffadabf39a8 +bitmap 0b109ac32b03e48b00115f536eefacc36ee45668 +kspp e6f3b3c9c109ed57230996cf4a4c1b8ae7e36a81 +kspp-gustavo 6bf825b2731d96e2e856afeaa5275642f0dfb65b +mm-stable 059342d1dd4e01d634184793fa3f8437e62afaa1 +mm-nonmm-stable f6e2c20ca7604e6a267c93a511d19dda72573be1 +mm cdb5a08f5c15d0fd157ff269e6867f1fed1d20e9 +akpm 468e4d4736f32f597b067c6debb6e0202d23d887 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e0c4238865b4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,350 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..175cc3f70766 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12067 @@ +$ date -R +Tue, 03 May 2022 07:56:07 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 78% (6532/8285)
Updating files: 79% (6546/8285)
Updating files: 80% (6628/8285)
Updating files: 81% (6711/8285)
Updating files: 82% (6794/8285)
Updating files: 83% (6877/8285)
Updating files: 84% (6960/8285)
Updating files: 85% (7043/8285)
Updating files: 86% (7126/8285)
Updating files: 87% (7208/8285)
Updating files: 88% (7291/8285)
Updating files: 89% (7374/8285)
Updating files: 90% (7457/8285)
Updating files: 91% (7540/8285)
Updating files: 92% (7623/8285)
Updating files: 93% (7706/8285)
Updating files: 94% (7788/8285)
Updating files: 95% (7871/8285)
Updating files: 96% (7954/8285)
Updating files: 97% (8037/8285)
Updating files: 98% (8120/8285)
Updating files: 99% (8203/8285)
Updating files: 100% (8285/8285)
Updating files: 100% (8285/8285), done. +HEAD is now at 672c0c517342 Linux 5.18-rc5 +Merging origin/master (9050ba3a61a4 Merge tag 'for-5.18-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 672c0c517342..9050ba3a61a4 +Fast-forward (no commit created; -m option ignored) + fs/btrfs/btrfs_inode.h | 11 ++++++++++ + fs/btrfs/inode.c | 15 ++----------- + fs/btrfs/props.c | 59 +++++++++++++++++++++++++++++++++++++++++++++----- + fs/btrfs/props.h | 4 +++- + fs/btrfs/tree-log.c | 14 +++++++++++- + fs/btrfs/xattr.c | 11 +++++++--- + 6 files changed, 91 insertions(+), 23 deletions(-) +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (10663622a1e5 arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + arch/arm/include/asm/io.h | 3 +++ + arch/arm/mm/ioremap.c | 8 ++++++++ + arch/arm64/include/asm/io.h | 4 ++++ + arch/arm64/mm/ioremap.c | 8 ++++++++ + fs/proc/fd.c | 23 ++++++++++++++++++++++- + mm/huge_memory.c | 7 ++++++- + mm/memory-failure.c | 15 +-------------- + mm/mremap.c | 2 +- + 8 files changed, 53 insertions(+), 17 deletions(-) +Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()) +$ 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 (c35fe2a68f29 elf: Fix the arm64 MTE ELF segment name and value) +$ 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 (adee8aa22a92 Revert "arm: dts: at91: Fix boolean properties with values") +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ 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 (bb82c574691d powerpc/perf: Fix 32bit compile) +$ 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 (b5d1274409d0 KVM: s390: Fix lockdep issue in vm memop) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/Makefile | 10 ++++++++++ + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + 2 files changed, 20 insertions(+), 1 deletion(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (79396934e289 net: dsa: b53: convert to phylink_pcs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + drivers/net/can/grcan.c | 46 +++++++------- + drivers/net/dsa/b53/b53_common.c | 36 +++-------- + drivers/net/dsa/b53/b53_priv.h | 24 ++++---- + drivers/net/dsa/b53/b53_serdes.c | 74 ++++++++++++++++------- + drivers/net/dsa/b53/b53_serdes.h | 9 +-- + drivers/net/dsa/b53/b53_srab.c | 4 +- + drivers/net/dsa/microchip/ksz9477.c | 38 ++++++++++-- + drivers/net/dsa/mt7530.c | 1 + + drivers/net/ethernet/cavium/thunder/nic_main.c | 16 ++--- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 7 ++- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 5 +- + drivers/net/mdio/mdio-mux-bcm6368.c | 2 +- + drivers/nfc/nfcmrvl/main.c | 2 +- + include/linux/stmmac.h | 1 + + net/can/isotp.c | 25 ++------ + net/ipv4/igmp.c | 9 ++- + net/ipv6/mcast.c | 8 +-- + net/nfc/core.c | 29 +++++---- + net/rxrpc/local_object.c | 3 + + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/forwarding/Makefile | 33 ++++++++++ + 25 files changed, 225 insertions(+), 155 deletions(-) +Merging bpf/master (a0df71948e95 tls: Skip tls_append_frag on zero copy size) +$ 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 (79396934e289 net: dsa: b53: convert to phylink_pcs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/main (bb300130e47f ath11k: reduce the wait time of 11d scan and hw scan while add interface) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/net/wireless/ath/ath11k/core.c | 1 + + drivers/net/wireless/ath/ath11k/core.h | 13 ++++- + drivers/net/wireless/ath/ath11k/mac.c | 71 ++++++++++-------------- + drivers/net/wireless/ath/ath11k/mac.h | 2 +- + drivers/net/wireless/ath/ath11k/reg.c | 43 +++++++++----- + drivers/net/wireless/ath/ath11k/reg.h | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 16 +++++- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- + 9 files changed, 86 insertions(+), 66 deletions(-) +Merging rdma-fixes/for-rc (570a4bf7440e RDMA/rxe: Recheck the MR in when generating a READ reply) +$ 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 'ort' strategy. + drivers/infiniband/hw/irdma/cm.c | 7 +------ + drivers/infiniband/sw/rxe/rxe_resp.c | 35 +++++++++++++++++++++++++---------- + 2 files changed, 26 insertions(+), 16 deletions(-) +Merging sound-current/for-linus (eb9d84b0ffe3 ALSA: fireworks: fix wrong return count shorter than expected by 4 bytes) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 3 +++ + drivers/firewire/core-cdev.c | 4 +++- + drivers/firewire/core-topology.c | 9 +++------ + drivers/firewire/core-transaction.c | 30 ++++++++++++++++-------------- + drivers/firewire/sbp2.c | 13 +++++++------ + sound/firewire/fireworks/fireworks_hwdep.c | 1 + + sound/pci/hda/patch_realtek.c | 15 +++++++++------ + 7 files changed, 42 insertions(+), 33 deletions(-) +Merging sound-asoc-fixes/for-linus (3a129880c5de Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/atmel/mchp-pdmc.c | 1 + + sound/soc/codecs/da7219.c | 14 ++++++++++---- + sound/soc/codecs/max98090.c | 5 ++++- + sound/soc/codecs/rk3328_codec.c | 2 +- + sound/soc/codecs/rt9120.c | 1 - + sound/soc/codecs/wm8958-dsp2.c | 8 ++++---- + sound/soc/codecs/wm8960.c | 15 ++++++++++++++- + sound/soc/codecs/wm_adsp.c | 10 +++++----- + sound/soc/generic/simple-card-utils.c | 2 +- + sound/soc/meson/aiu-acodec-ctrl.c | 2 +- + sound/soc/meson/aiu-codec-ctrl.c | 2 +- + sound/soc/meson/axg-card.c | 1 - + sound/soc/meson/axg-tdm-interface.c | 26 +++++--------------------- + sound/soc/meson/g12a-tohdmitx.c | 2 +- + sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- + sound/soc/soc-ops.c | 20 ++++++++++++++++++-- + sound/soc/sof/sof-pci-dev.c | 5 +++++ + 17 files changed, 74 insertions(+), 48 deletions(-) +Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (dfd2b37edf7e regulator: dt-bindings: Revise the rt5190a buck/ldo description) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (8868c03f3ca5 spi: spi-mem: check if data buffers are on stack) +$ 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 'ort' strategy. + drivers/spi/spi-mem.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging pci-current/for-linus (92597f97a40b PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/pci.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging driver-core.current/driver-core-linus (672c0c517342 Linux 5.18-rc5) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (672c0c517342 Linux 5.18-rc5) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (672c0c517342 Linux 5.18-rc5) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (e23e50e7acc8 USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (fe18894930a0 iio: mma8452: fix probe fail when device tree compatible is used.) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/mma8452.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (672c0c517342 Linux 5.18-rc5) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (672c0c517342 Linux 5.18-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 (4352e23a7ff2 Input: cros-ec-keyb - only register keyboard if rows/columns exist) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) +Merging crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - Fixup SLS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (e8f0c8965932 selftest/vm: add skip support to mremap_test) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. +Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod()) +$ 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 (9889fc4f19e0 dmaengine: idxd: Fix the error handling path in idxd_cdev_register()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/idxd/cdev.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/i2c/Kconfig | 1 + + drivers/media/usb/dvb-usb/a800.c | 18 +- + drivers/media/usb/dvb-usb/af9005.c | 19 +- + drivers/media/usb/dvb-usb/az6027.c | 45 +- + drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +- + drivers/media/usb/dvb-usb/cxusb.c | 88 +--- + drivers/media/usb/dvb-usb/dib0700_devices.c | 428 +++++++++++-------- + drivers/media/usb/dvb-usb/dibusb-mb.c | 165 ++++---- + drivers/media/usb/dvb-usb/dibusb-mc.c | 88 ++-- + drivers/media/usb/dvb-usb/digitv.c | 13 +- + drivers/media/usb/dvb-usb/dtt200u.c | 56 ++- + drivers/media/usb/dvb-usb/dtv5100.c | 11 +- + drivers/media/usb/dvb-usb/dw2102.c | 84 ++-- + drivers/media/usb/dvb-usb/gp8psk.c | 36 +- + drivers/media/usb/dvb-usb/m920x.c | 51 ++- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 18 +- + drivers/media/usb/dvb-usb/opera1.c | 15 +- + drivers/media/usb/dvb-usb/pctv452e.c | 22 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 11 +- + drivers/media/usb/dvb-usb/ttusb2.c | 36 +- + drivers/media/usb/dvb-usb/umt-010.c | 18 +- + drivers/media/usb/dvb-usb/vp702x.c | 23 +- + drivers/media/usb/dvb-usb/vp7045.c | 28 +- + include/media/dvb-usb-ids.h | 632 +++++++++++++++------------- + 24 files changed, 1072 insertions(+), 844 deletions(-) +Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/include/asm/timex.h | 8 ++++---- + arch/mips/kernel/time.c | 11 +++-------- + 2 files changed, 7 insertions(+), 12 deletions(-) +Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (f751d8eac176 KVM: x86: work around QEMU issue with synthetic CPUID leaves) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. +Merging hwmon-fixes/hwmon (08da09f02804 hwmon: (pmbus) delta-ahe50dc-fan: work around hardware quirk) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/ti,tmp421.yaml | 7 +++---- + drivers/hwmon/adt7470.c | 4 ++-- + drivers/hwmon/asus_wmi_sensors.c | 2 +- + drivers/hwmon/f71882fg.c | 5 +++-- + drivers/hwmon/pmbus/delta-ahe50dc-fan.c | 16 ++++++++++++++++ + drivers/hwmon/pmbus/pmbus_core.c | 3 +++ + drivers/hwmon/pmbus/xdpe12284.c | 2 +- + 7 files changed, 29 insertions(+), 10 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (e4a747ad6e40 Merge branch 'misc-5.18' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (eb2fd9b43fae platform/x86/intel: pmc/core: change pmc_lpm_modes to static) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 7 ++++++- + arch/arm/mach-s3c/Kconfig.s3c64xx | 7 ++++++- + arch/arm/mach-s3c/cpu.c | 1 + + arch/arm/mach-s3c/init.c | 2 ++ + arch/arm/mach-s3c/s3c24xx.c | 7 +++++++ + arch/arm/mach-s3c/s3c64xx.c | 7 +++++++ + 6 files changed, 29 insertions(+), 2 deletions(-) +Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (e17fd4bf54fb dt-bindings: leds-mt6360: Drop redundant 'unevaluatedProperties') +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/leds-mt6360.yaml | 2 -- + Documentation/devicetree/bindings/ufs/cdns,ufshc.yaml | 3 +++ + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging scsi-fixes/fixes (8be70a842f70 scsi: target: pscsi: Set SCF_TREAT_READ_AS_NORMAL flag only if there is valid data) +$ 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 (9d9f720733b7 Merge tag 'amd-drm-fixes-5.18-2022-04-27' 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 +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (f7e1089f4376 drm/i915/fbc: Consult hw.crtc instead of uapi.crtc) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4bc31edebde5 mmc: core: Set HS clock speed before sending HS CMD13) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/mmc.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c6fe81191bd7 RISC-V: relocate DTB if it's outside memory region) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/mm/init.c | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (312310928417 Linux 5.18-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 (e5f6e5d554ac gpio: mvebu: drop pwm base assignment) +$ 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 'ort' strategy. + drivers/gpio/gpio-mvebu.c | 7 ------- + drivers/gpio/gpiolib-of.c | 2 +- + 2 files changed, 1 insertion(+), 8 deletions(-) +Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (4d5004451ab2 SUNRPC: Fix the svc_deferred_event trace class) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (8013d1d3d2e3 Merge tag 'soc-fixes-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (dc3ae06c5f21 drm/sun4i: Remove obsolete references to PHYS_OFFSET) +$ 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 kbuild/for-next (3eb85539032f Makefile: fix 2 typos) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging scripts/Makefile.build +Merge made by the 'ort' strategy. + .gitignore | 1 + + Documentation/kbuild/kconfig-language.rst | 6 ++ + Makefile | 13 ++-- + certs/Makefile | 4 +- + kernel/gen_kheaders.sh | 2 +- + scripts/Makefile | 4 +- + scripts/Makefile.build | 98 ++++++++++++------------------- + scripts/Makefile.extrawarn | 13 +++- + scripts/Makefile.lib | 6 +- + scripts/adjust_autoksyms.sh | 2 +- + scripts/checksyscalls.sh | 2 +- + scripts/dummy-tools/pahole | 4 ++ + scripts/gen_autoksyms.sh | 18 +++--- + scripts/kconfig/gconf-cfg.sh | 12 ++-- + scripts/kconfig/mconf-cfg.sh | 16 ++--- + scripts/kconfig/nconf-cfg.sh | 16 ++--- + scripts/kconfig/qconf-cfg.sh | 14 ++--- + scripts/mod/modpost.c | 92 ++++++++++++----------------- + scripts/mod/modpost.h | 9 --- + scripts/mod/sumversion.c | 11 +--- + tools/objtool/Makefile | 4 +- + usr/include/Makefile | 2 +- + 22 files changed, 163 insertions(+), 186 deletions(-) + create mode 100755 scripts/dummy-tools/pahole +Merging perf/perf/core (e0c1b8f9eba8 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 +Merge made by the 'ort' strategy. + tools/lib/perf/evsel.c | 19 +- + tools/perf/Documentation/perf-arm-spe.txt | 218 ++++ + tools/perf/Documentation/perf-stat.txt | 10 + + tools/perf/Documentation/perf.txt | 2 +- + tools/perf/arch/riscv/Makefile | 1 + + tools/perf/builtin-stat.c | 64 +- + tools/perf/builtin-version.c | 1 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 761 ++++++++++++ + .../arch/x86/cascadelakex/uncore-memory.json | 61 + + .../arch/x86/cascadelakex/uncore-other.json | 92 ++ + .../pmu-events/arch/x86/elkhartlake/other.json | 13 +- + .../pmu-events/arch/x86/elkhartlake/pipeline.json | 13 +- + tools/perf/pmu-events/arch/x86/goldmont/other.json | 31 +- + .../pmu-events/arch/x86/goldmont/pipeline.json | 31 +- + .../pmu-events/arch/x86/goldmontplus/other.json | 37 +- + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 37 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 24 +- + tools/perf/pmu-events/arch/x86/icelake/other.json | 14 +- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 14 +- + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 31 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 24 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 21 +- + tools/perf/pmu-events/arch/x86/icelakex/other.json | 70 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 14 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + + .../perf/pmu-events/arch/x86/nehalemep/other.json | 66 +- + .../pmu-events/arch/x86/nehalemep/pipeline.json | 66 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 1083 +++++++++++++++++ + .../arch/x86/sapphirerapids/floating-point.json | 218 ++++ + .../arch/x86/sapphirerapids/frontend.json | 471 ++++++++ + .../pmu-events/arch/x86/sapphirerapids/memory.json | 415 +++++++ + .../pmu-events/arch/x86/sapphirerapids/other.json | 329 +++++ + .../arch/x86/sapphirerapids/pipeline.json | 1271 ++++++++++++++++++++ + .../arch/x86/sapphirerapids/virtual-memory.json | 225 ++++ + .../arch/x86/skylakex/uncore-memory.json | 20 + + .../pmu-events/arch/x86/skylakex/uncore-other.json | 92 ++ + .../perf/pmu-events/arch/x86/tigerlake/other.json | 13 +- + .../pmu-events/arch/x86/tigerlake/pipeline.json | 13 +- + tools/perf/pmu-events/arch/x86/tremontx/other.json | 13 +- + .../pmu-events/arch/x86/tremontx/pipeline.json | 13 +- + .../arch/x86/tremontx/uncore-memory.json | 22 + + .../pmu-events/arch/x86/tremontx/uncore-other.json | 94 ++ + .../pmu-events/arch/x86/westmereep-dp/other.json | 66 +- + .../arch/x86/westmereep-dp/pipeline.json | 66 +- + .../pmu-events/arch/x86/westmereep-sp/other.json | 66 +- + .../arch/x86/westmereep-sp/pipeline.json | 66 +- + .../perf/pmu-events/arch/x86/westmereex/other.json | 66 +- + .../pmu-events/arch/x86/westmereex/pipeline.json | 66 +- + tools/perf/tests/builtin-test.c | 4 +- + tools/perf/tests/shell/record.sh | 42 + + tools/perf/util/bpf-loader.c | 27 +- + tools/perf/util/evsel.c | 19 +- + tools/perf/util/evsel.h | 5 + + tools/perf/util/genelf.h | 3 + + tools/perf/util/mem-events.c | 29 +- + tools/perf/util/metricgroup.c | 263 +++- + tools/perf/util/parse-events.c | 44 +- + tools/perf/util/parse-events.l | 2 + + tools/perf/util/path.c | 14 +- + tools/perf/util/path.h | 1 + + .../util/scripting-engines/trace-event-python.c | 49 +- + tools/perf/util/stat-display.c | 25 +- + tools/perf/util/stat-shadow.c | 2 + + tools/perf/util/stat.c | 4 +- + tools/perf/util/stat.h | 22 + + tools/perf/util/topdown.c | 17 +- + tools/perf/util/topdown.h | 3 +- + tools/perf/util/util.c | 5 + + 68 files changed, 6397 insertions(+), 607 deletions(-) + create mode 100644 tools/perf/Documentation/perf-arm-spe.txt + create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/adl-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/virtual-memory.json + create mode 100755 tools/perf/tests/shell/record.sh +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (3cb4503a3301 x86: remove cruft from <asm/dma-mapping.h>) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + arch/arm/mm/init.c | 6 +- + arch/arm/xen/mm.c | 26 +++--- + arch/arm64/mm/init.c | 6 +- + arch/ia64/include/asm/iommu_table.h | 7 -- + arch/ia64/mm/init.c | 4 +- + arch/mips/cavium-octeon/dma-octeon.c | 15 +-- + arch/mips/loongson64/dma.c | 2 +- + arch/mips/pci/pci-octeon.c | 2 +- + arch/mips/sibyte/common/dma.c | 2 +- + arch/powerpc/include/asm/svm.h | 4 - + arch/powerpc/include/asm/swiotlb.h | 1 + + arch/powerpc/kernel/dma-swiotlb.c | 1 + + arch/powerpc/mm/mem.c | 6 +- + arch/powerpc/platforms/pseries/setup.c | 3 - + arch/powerpc/platforms/pseries/svm.c | 26 +----- + arch/riscv/mm/init.c | 8 +- + arch/s390/mm/init.c | 3 +- + arch/x86/include/asm/dma-mapping.h | 12 --- + arch/x86/include/asm/gart.h | 5 +- + arch/x86/include/asm/iommu.h | 8 ++ + arch/x86/include/asm/iommu_table.h | 102 --------------------- + arch/x86/include/asm/swiotlb.h | 30 ------ + arch/x86/include/asm/xen/page.h | 5 - + arch/x86/include/asm/xen/swiotlb-xen.h | 2 - + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/amd_gart_64.c | 5 +- + arch/x86/kernel/aperture_64.c | 14 +-- + arch/x86/kernel/cpu/mshyperv.c | 8 -- + arch/x86/kernel/pci-dma.c | 114 ++++++++++++++++++----- + arch/x86/kernel/pci-iommu_table.c | 77 ---------------- + arch/x86/kernel/pci-swiotlb.c | 77 ---------------- + arch/x86/kernel/tboot.c | 1 - + arch/x86/kernel/vmlinux.lds.S | 12 --- + arch/x86/mm/mem_encrypt_amd.c | 3 - + arch/x86/pci/sta2x11-fixup.c | 2 +- + arch/x86/xen/Makefile | 2 - + arch/x86/xen/pci-swiotlb-xen.c | 96 -------------------- + drivers/iommu/amd/init.c | 6 -- + drivers/iommu/amd/iommu.c | 5 +- + drivers/iommu/intel/dmar.c | 6 +- + drivers/xen/swiotlb-xen.c | 132 +-------------------------- + include/linux/dmar.h | 6 +- + include/linux/swiotlb.h | 22 ++--- + include/trace/events/swiotlb.h | 29 ++---- + include/xen/arm/page.h | 1 - + include/xen/swiotlb-xen.h | 8 +- + kernel/dma/direct.h | 2 +- + kernel/dma/swiotlb.c | 161 +++++++++++++++------------------ + 48 files changed, 251 insertions(+), 826 deletions(-) + delete mode 100644 arch/ia64/include/asm/iommu_table.h + delete mode 100644 arch/x86/include/asm/iommu_table.h + delete mode 100644 arch/x86/include/asm/swiotlb.h + delete mode 100644 arch/x86/kernel/pci-iommu_table.c + delete mode 100644 arch/x86/kernel/pci-swiotlb.c + delete mode 100644 arch/x86/xen/pci-swiotlb-xen.c +Merging asm-generic/master (fba2689ee77e Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc 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 +CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree. +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml +rm 'Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml' +$ git commit --no-edit -v -a +[master e21be078d8bf] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/renesas,h8300-div-clock.txt | 24 -- + Documentation/devicetree/bindings/h8300/cpu.txt | 13 - + .../interrupt-controller/renesas,h8300h-intc.txt | 22 -- + .../interrupt-controller/renesas,h8s-intc.txt | 22 -- + .../memory-controllers/renesas,h8300-bsc.yaml | 35 -- + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../core/thread-info-in-task/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kcov/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../features/debug/kmemleak/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + MAINTAINERS | 11 - + arch/h8300/Kbuild | 5 - + arch/h8300/Kconfig | 49 --- + arch/h8300/Kconfig.cpu | 99 ----- + arch/h8300/Kconfig.debug | 2 - + arch/h8300/Makefile | 44 --- + arch/h8300/boot/Makefile | 27 -- + arch/h8300/boot/compressed/Makefile | 45 --- + arch/h8300/boot/compressed/head.S | 49 --- + arch/h8300/boot/compressed/misc.c | 76 ---- + arch/h8300/boot/compressed/vmlinux.lds | 35 -- + arch/h8300/boot/compressed/vmlinux.scr | 9 - + arch/h8300/boot/dts/Makefile | 6 - + arch/h8300/boot/dts/edosk2674.dts | 108 ----- + arch/h8300/boot/dts/h8300h_sim.dts | 97 ----- + arch/h8300/boot/dts/h8s_sim.dts | 100 ----- + arch/h8300/configs/edosk2674_defconfig | 48 --- + arch/h8300/configs/h8300h-sim_defconfig | 48 --- + arch/h8300/configs/h8s-sim_defconfig | 48 --- + arch/h8300/include/asm/Kbuild | 8 - + arch/h8300/include/asm/bitops.h | 179 --------- + arch/h8300/include/asm/bug.h | 13 - + arch/h8300/include/asm/byteorder.h | 7 - + arch/h8300/include/asm/cache.h | 12 - + arch/h8300/include/asm/elf.h | 102 ----- + arch/h8300/include/asm/flat.h | 36 -- + arch/h8300/include/asm/hash.h | 54 --- + arch/h8300/include/asm/io.h | 67 ---- + arch/h8300/include/asm/irq.h | 25 -- + arch/h8300/include/asm/irqflags.h | 97 ----- + arch/h8300/include/asm/kgdb.h | 45 --- + arch/h8300/include/asm/mmu_context.h | 6 - + arch/h8300/include/asm/page.h | 17 - + arch/h8300/include/asm/page_offset.h | 2 - + arch/h8300/include/asm/pgtable.h | 43 -- + arch/h8300/include/asm/processor.h | 126 ------ + arch/h8300/include/asm/ptrace.h | 39 -- + arch/h8300/include/asm/signal.h | 23 -- + arch/h8300/include/asm/smp.h | 1 - + arch/h8300/include/asm/string.h | 18 - + arch/h8300/include/asm/switch_to.h | 52 --- + arch/h8300/include/asm/syscall.h | 43 -- + arch/h8300/include/asm/thread_info.h | 102 ----- + arch/h8300/include/asm/tlb.h | 7 - + arch/h8300/include/asm/traps.h | 41 -- + arch/h8300/include/asm/user.h | 71 ---- + arch/h8300/include/asm/vmalloc.h | 4 - + arch/h8300/include/uapi/asm/Kbuild | 2 - + arch/h8300/include/uapi/asm/byteorder.h | 7 - + arch/h8300/include/uapi/asm/posix_types.h | 13 - + arch/h8300/include/uapi/asm/ptrace.h | 43 -- + arch/h8300/include/uapi/asm/sigcontext.h | 19 - + arch/h8300/include/uapi/asm/signal.h | 92 ----- + arch/h8300/include/uapi/asm/unistd.h | 8 - + arch/h8300/kernel/.gitignore | 2 - + arch/h8300/kernel/Makefile | 22 -- + arch/h8300/kernel/asm-offsets.c | 70 ---- + arch/h8300/kernel/entry.S | 433 --------------------- + arch/h8300/kernel/h8300_ksyms.c | 35 -- + arch/h8300/kernel/head_ram.S | 60 --- + arch/h8300/kernel/head_rom.S | 111 ------ + arch/h8300/kernel/irq.c | 99 ----- + arch/h8300/kernel/kgdb.c | 135 ------- + arch/h8300/kernel/module.c | 71 ---- + arch/h8300/kernel/process.c | 173 -------- + arch/h8300/kernel/ptrace.c | 199 ---------- + arch/h8300/kernel/ptrace_h.c | 256 ------------ + arch/h8300/kernel/ptrace_s.c | 44 --- + arch/h8300/kernel/setup.c | 213 ---------- + arch/h8300/kernel/signal.c | 287 -------------- + arch/h8300/kernel/sim-console.c | 31 -- + arch/h8300/kernel/syscalls.c | 15 - + arch/h8300/kernel/traps.c | 156 -------- + arch/h8300/kernel/vmlinux.lds.S | 69 ---- + arch/h8300/lib/Makefile | 9 - + arch/h8300/lib/abs.S | 21 - + arch/h8300/lib/ashldi3.c | 25 -- + arch/h8300/lib/ashrdi3.c | 25 -- + arch/h8300/lib/delay.c | 41 -- + arch/h8300/lib/libgcc.h | 78 ---- + arch/h8300/lib/lshrdi3.c | 24 -- + arch/h8300/lib/memcpy.S | 86 ---- + arch/h8300/lib/memset.S | 70 ---- + arch/h8300/lib/moddivsi3.S | 73 ---- + arch/h8300/lib/modsi3.S | 73 ---- + arch/h8300/lib/muldi3.c | 45 --- + arch/h8300/lib/mulsi3.S | 39 -- + arch/h8300/lib/ucmpdi2.c | 18 - + arch/h8300/lib/udivsi3.S | 77 ---- + arch/h8300/mm/Makefile | 6 - + arch/h8300/mm/fault.c | 57 --- + arch/h8300/mm/init.c | 95 ----- + arch/h8300/mm/memory.c | 52 --- + drivers/clk/Makefile | 1 - + drivers/clk/h8300/Makefile | 3 - + drivers/clk/h8300/clk-div.c | 57 --- + drivers/clk/h8300/clk-h8s2678.c | 145 ------- + drivers/clocksource/Kconfig | 20 - + drivers/clocksource/Makefile | 3 - + drivers/clocksource/h8300_timer16.c | 192 --------- + drivers/clocksource/h8300_timer8.c | 211 ---------- + drivers/clocksource/h8300_tpu.c | 158 -------- + drivers/irqchip/Kconfig | 11 - + drivers/irqchip/Makefile | 2 - + drivers/irqchip/irq-renesas-h8300h.c | 94 ----- + drivers/irqchip/irq-renesas-h8s.c | 102 ----- + drivers/net/ethernet/smsc/Kconfig | 4 +- + drivers/net/ethernet/smsc/smc91x.h | 11 - + drivers/tty/serial/Kconfig | 5 +- + init/Kconfig | 3 +- + tools/arch/h8300/include/asm/bitsperlong.h | 15 - + tools/arch/h8300/include/uapi/asm/mman.h | 7 - + 159 files changed, 5 insertions(+), 6922 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt + delete mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml + delete mode 100644 arch/h8300/Kbuild + delete mode 100644 arch/h8300/Kconfig + delete mode 100644 arch/h8300/Kconfig.cpu + delete mode 100644 arch/h8300/Kconfig.debug + delete mode 100644 arch/h8300/Makefile + delete mode 100644 arch/h8300/boot/Makefile + delete mode 100644 arch/h8300/boot/compressed/Makefile + delete mode 100644 arch/h8300/boot/compressed/head.S + delete mode 100644 arch/h8300/boot/compressed/misc.c + delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds + delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr + delete mode 100644 arch/h8300/boot/dts/Makefile + delete mode 100644 arch/h8300/boot/dts/edosk2674.dts + delete mode 100644 arch/h8300/boot/dts/h8300h_sim.dts + delete mode 100644 arch/h8300/boot/dts/h8s_sim.dts + delete mode 100644 arch/h8300/configs/edosk2674_defconfig + delete mode 100644 arch/h8300/configs/h8300h-sim_defconfig + delete mode 100644 arch/h8300/configs/h8s-sim_defconfig + delete mode 100644 arch/h8300/include/asm/Kbuild + delete mode 100644 arch/h8300/include/asm/bitops.h + delete mode 100644 arch/h8300/include/asm/bug.h + delete mode 100644 arch/h8300/include/asm/byteorder.h + delete mode 100644 arch/h8300/include/asm/cache.h + delete mode 100644 arch/h8300/include/asm/elf.h + delete mode 100644 arch/h8300/include/asm/flat.h + delete mode 100644 arch/h8300/include/asm/hash.h + delete mode 100644 arch/h8300/include/asm/io.h + delete mode 100644 arch/h8300/include/asm/irq.h + delete mode 100644 arch/h8300/include/asm/irqflags.h + delete mode 100644 arch/h8300/include/asm/kgdb.h + delete mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 arch/h8300/include/asm/page.h + delete mode 100644 arch/h8300/include/asm/page_offset.h + delete mode 100644 arch/h8300/include/asm/pgtable.h + delete mode 100644 arch/h8300/include/asm/processor.h + delete mode 100644 arch/h8300/include/asm/ptrace.h + delete mode 100644 arch/h8300/include/asm/signal.h + delete mode 100644 arch/h8300/include/asm/smp.h + delete mode 100644 arch/h8300/include/asm/string.h + delete mode 100644 arch/h8300/include/asm/switch_to.h + delete mode 100644 arch/h8300/include/asm/syscall.h + delete mode 100644 arch/h8300/include/asm/thread_info.h + delete mode 100644 arch/h8300/include/asm/tlb.h + delete mode 100644 arch/h8300/include/asm/traps.h + delete mode 100644 arch/h8300/include/asm/user.h + delete mode 100644 arch/h8300/include/asm/vmalloc.h + delete mode 100644 arch/h8300/include/uapi/asm/Kbuild + delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h + delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h + delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/h8300/include/uapi/asm/signal.h + delete mode 100644 arch/h8300/include/uapi/asm/unistd.h + delete mode 100644 arch/h8300/kernel/.gitignore + delete mode 100644 arch/h8300/kernel/Makefile + delete mode 100644 arch/h8300/kernel/asm-offsets.c + delete mode 100644 arch/h8300/kernel/entry.S + delete mode 100644 arch/h8300/kernel/h8300_ksyms.c + delete mode 100644 arch/h8300/kernel/head_ram.S + delete mode 100644 arch/h8300/kernel/head_rom.S + delete mode 100644 arch/h8300/kernel/irq.c + delete mode 100644 arch/h8300/kernel/kgdb.c + delete mode 100644 arch/h8300/kernel/module.c + delete mode 100644 arch/h8300/kernel/process.c + delete mode 100644 arch/h8300/kernel/ptrace.c + delete mode 100644 arch/h8300/kernel/ptrace_h.c + delete mode 100644 arch/h8300/kernel/ptrace_s.c + delete mode 100644 arch/h8300/kernel/setup.c + delete mode 100644 arch/h8300/kernel/signal.c + delete mode 100644 arch/h8300/kernel/sim-console.c + delete mode 100644 arch/h8300/kernel/syscalls.c + delete mode 100644 arch/h8300/kernel/traps.c + delete mode 100644 arch/h8300/kernel/vmlinux.lds.S + delete mode 100644 arch/h8300/lib/Makefile + delete mode 100644 arch/h8300/lib/abs.S + delete mode 100644 arch/h8300/lib/ashldi3.c + delete mode 100644 arch/h8300/lib/ashrdi3.c + delete mode 100644 arch/h8300/lib/delay.c + delete mode 100644 arch/h8300/lib/libgcc.h + delete mode 100644 arch/h8300/lib/lshrdi3.c + delete mode 100644 arch/h8300/lib/memcpy.S + delete mode 100644 arch/h8300/lib/memset.S + delete mode 100644 arch/h8300/lib/moddivsi3.S + delete mode 100644 arch/h8300/lib/modsi3.S + delete mode 100644 arch/h8300/lib/muldi3.c + delete mode 100644 arch/h8300/lib/mulsi3.S + delete mode 100644 arch/h8300/lib/ucmpdi2.c + delete mode 100644 arch/h8300/lib/udivsi3.S + delete mode 100644 arch/h8300/mm/Makefile + delete mode 100644 arch/h8300/mm/fault.c + delete mode 100644 arch/h8300/mm/init.c + delete mode 100644 arch/h8300/mm/memory.c + delete mode 100644 drivers/clk/h8300/Makefile + delete mode 100644 drivers/clk/h8300/clk-div.c + delete mode 100644 drivers/clk/h8300/clk-h8s2678.c + delete mode 100644 drivers/clocksource/h8300_timer16.c + delete mode 100644 drivers/clocksource/h8300_timer8.c + delete mode 100644 drivers/clocksource/h8300_tpu.c + delete mode 100644 drivers/irqchip/irq-renesas-h8300h.c + delete mode 100644 drivers/irqchip/irq-renesas-h8s.c + delete mode 100644 tools/arch/h8300/include/asm/bitsperlong.h + delete mode 100644 tools/arch/h8300/include/uapi/asm/mman.h +Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Merge made by the 'ort' strategy. + arch/arc/Kconfig | 2 + + arch/arc/include/asm/perf_event.h | 4 + + arch/arc/include/asm/ptrace.h | 27 ++++++ + arch/arc/include/asm/syscall.h | 2 + + arch/arc/include/asm/thread_info.h | 5 +- + arch/arc/include/uapi/asm/bpf_perf_event.h | 9 ++ + arch/arc/kernel/disasm.c | 64 ++++++++++++- + arch/arc/kernel/entry.S | 12 +-- + arch/arc/kernel/ptrace.c | 140 ++++++++++++++++++++++++++++- + 9 files changed, 253 insertions(+), 12 deletions(-) + create mode 100644 arch/arc/include/uapi/asm/bpf_perf_event.h +Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/switch_to.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/stacktrace.c +Auto-merging arch/arm/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mach-s3c/mach-jive.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/irqchip/irq-nvic.c +Auto-merging lib/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 5075bc6921b4] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging arm64/for-next/core (c3adaa5c5c55 Merge branch 'for-next/kselftest' 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 Documentation/virt/kvm/api.rst +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Auto-merging arch/arm64/kvm/inject_fault.c +Auto-merging include/uapi/linux/elf.h +Merge made by the 'ort' strategy. + Documentation/arm64/booting.rst | 10 + + Documentation/arm64/elf_hwcaps.rst | 33 ++ + Documentation/arm64/index.rst | 1 + + Documentation/arm64/sme.rst | 428 +++++++++++++++ + Documentation/arm64/sve.rst | 70 ++- + Documentation/virt/kvm/api.rst | 2 + + arch/Kconfig | 7 + + arch/arm64/Kconfig | 12 + + arch/arm64/include/asm/cpu.h | 4 + + arch/arm64/include/asm/cpufeature.h | 24 + + arch/arm64/include/asm/debug-monitors.h | 4 +- + arch/arm64/include/asm/el2_setup.h | 64 ++- + arch/arm64/include/asm/esr.h | 21 +- + arch/arm64/include/asm/exception.h | 29 +- + arch/arm64/include/asm/fpsimd.h | 123 ++++- + arch/arm64/include/asm/fpsimdmacros.h | 87 +++ + arch/arm64/include/asm/ftrace.h | 7 + + arch/arm64/include/asm/hwcap.h | 8 + + arch/arm64/include/asm/kvm_arm.h | 1 + + arch/arm64/include/asm/kvm_emulate.h | 6 +- + arch/arm64/include/asm/kvm_host.h | 6 +- + arch/arm64/include/asm/kvm_ras.h | 2 +- + arch/arm64/include/asm/mte.h | 1 + + arch/arm64/include/asm/pgtable-hwdef.h | 4 +- + arch/arm64/include/asm/processor.h | 26 +- + arch/arm64/include/asm/stacktrace.h | 32 -- + arch/arm64/include/asm/sysreg.h | 67 +++ + arch/arm64/include/asm/system_misc.h | 4 +- + arch/arm64/include/asm/thread_info.h | 2 + + arch/arm64/include/asm/traps.h | 12 +- + arch/arm64/include/asm/uaccess.h | 15 + + arch/arm64/include/uapi/asm/hwcap.h | 8 + + arch/arm64/include/uapi/asm/kvm.h | 2 + + arch/arm64/include/uapi/asm/ptrace.h | 69 ++- + arch/arm64/include/uapi/asm/sigcontext.h | 55 +- + arch/arm64/kernel/cpufeature.c | 107 ++++ + arch/arm64/kernel/cpuinfo.c | 13 + + arch/arm64/kernel/debug-monitors.c | 12 +- + arch/arm64/kernel/entry-common.c | 17 +- + arch/arm64/kernel/entry-fpsimd.S | 36 ++ + arch/arm64/kernel/entry-ftrace.S | 17 - + arch/arm64/kernel/fpsimd.c | 591 +++++++++++++++++++-- + arch/arm64/kernel/ftrace.c | 17 + + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/arm64/kernel/kgdb.c | 6 +- + arch/arm64/kernel/mte.c | 30 ++ + arch/arm64/kernel/probes/kprobes.c | 4 +- + arch/arm64/kernel/probes/uprobes.c | 4 +- + arch/arm64/kernel/process.c | 44 +- + arch/arm64/kernel/ptrace.c | 358 +++++++++++-- + arch/arm64/kernel/signal.c | 188 ++++++- + arch/arm64/kernel/stacktrace.c | 124 +++-- + arch/arm64/kernel/sys_compat.c | 2 +- + arch/arm64/kernel/syscall.c | 29 +- + arch/arm64/kernel/traps.c | 67 +-- + arch/arm64/kvm/arm.c | 1 + + arch/arm64/kvm/fpsimd.c | 43 +- + arch/arm64/kvm/handle_exit.c | 16 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 30 ++ + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 2 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 +- + arch/arm64/kvm/hyp/vhe/switch.c | 11 +- + arch/arm64/kvm/inject_fault.c | 4 +- + arch/arm64/kvm/sys_regs.c | 13 +- + arch/arm64/mm/fault.c | 70 +-- + arch/arm64/tools/cpucaps | 2 + + arch/x86/kernel/ftrace.c | 17 +- + fs/btrfs/ioctl.c | 7 +- + include/linux/pagemap.h | 1 + + include/linux/uaccess.h | 22 + + include/uapi/linux/elf.h | 2 + + include/uapi/linux/prctl.h | 9 + + kernel/sys.c | 12 + + kernel/trace/fgraph.c | 18 + + mm/gup.c | 29 + + tools/testing/selftests/arm64/abi/.gitignore | 1 + + tools/testing/selftests/arm64/abi/Makefile | 9 +- + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 79 ++- + tools/testing/selftests/arm64/abi/syscall-abi.c | 204 ++++++- + tools/testing/selftests/arm64/abi/syscall-abi.h | 15 + + tools/testing/selftests/arm64/abi/tpidr2.c | 298 +++++++++++ + tools/testing/selftests/arm64/fp/.gitignore | 5 + + tools/testing/selftests/arm64/fp/Makefile | 46 +- + tools/testing/selftests/arm64/fp/rdvl-sme.c | 14 + + tools/testing/selftests/arm64/fp/rdvl.S | 10 + + tools/testing/selftests/arm64/fp/rdvl.h | 1 + + tools/testing/selftests/arm64/fp/sme-inst.h | 51 ++ + tools/testing/selftests/arm64/fp/ssve-stress | 59 ++ + tools/testing/selftests/arm64/fp/sve-ptrace.c | 175 +++++- + tools/testing/selftests/arm64/fp/sve-test.S | 20 + + tools/testing/selftests/arm64/fp/vec-syscfg.c | 10 + + tools/testing/selftests/arm64/fp/vlset.c | 10 +- + tools/testing/selftests/arm64/fp/za-fork-asm.S | 61 +++ + tools/testing/selftests/arm64/fp/za-fork.c | 156 ++++++ + tools/testing/selftests/arm64/fp/za-ptrace.c | 356 +++++++++++++ + tools/testing/selftests/arm64/fp/za-stress | 59 ++ + tools/testing/selftests/arm64/fp/za-test.S | 388 ++++++++++++++ + tools/testing/selftests/arm64/mte/.gitignore | 1 + + .../selftests/arm64/mte/check_child_memory.c | 8 +- + tools/testing/selftests/arm64/mte/check_prctl.c | 119 +++++ + .../testing/selftests/arm64/mte/mte_common_util.c | 19 +- + .../testing/selftests/arm64/mte/mte_common_util.h | 15 +- + tools/testing/selftests/arm64/signal/.gitignore | 3 + + .../testing/selftests/arm64/signal/test_signals.h | 4 + + .../selftests/arm64/signal/test_signals_utils.c | 6 + + .../testcases/fake_sigreturn_sme_change_vl.c | 92 ++++ + .../arm64/signal/testcases/sme_trap_no_sm.c | 38 ++ + .../signal/testcases/sme_trap_non_streaming.c | 45 ++ + .../selftests/arm64/signal/testcases/sme_trap_za.c | 36 ++ + .../selftests/arm64/signal/testcases/sme_vl.c | 68 +++ + .../selftests/arm64/signal/testcases/ssve_regs.c | 135 +++++ + .../selftests/arm64/signal/testcases/testcases.c | 36 ++ + .../selftests/arm64/signal/testcases/testcases.h | 3 +- + .../selftests/arm64/signal/testcases/za_regs.c | 128 +++++ + 115 files changed, 5542 insertions(+), 472 deletions(-) + create mode 100644 Documentation/arm64/sme.rst + create mode 100644 tools/testing/selftests/arm64/abi/syscall-abi.h + create mode 100644 tools/testing/selftests/arm64/abi/tpidr2.c + create mode 100644 tools/testing/selftests/arm64/fp/rdvl-sme.c + create mode 100644 tools/testing/selftests/arm64/fp/sme-inst.h + create mode 100644 tools/testing/selftests/arm64/fp/ssve-stress + create mode 100644 tools/testing/selftests/arm64/fp/za-fork-asm.S + create mode 100644 tools/testing/selftests/arm64/fp/za-fork.c + create mode 100644 tools/testing/selftests/arm64/fp/za-ptrace.c + create mode 100644 tools/testing/selftests/arm64/fp/za-stress + create mode 100644 tools/testing/selftests/arm64/fp/za-test.S + create mode 100644 tools/testing/selftests/arm64/mte/check_prctl.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sme_change_vl.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_no_sm.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_non_streaming.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_za.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_vl.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/ssve_regs.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/za_regs.c +Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (d8c5d0d2d566 soc:document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/include/asm/io.h +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/mach-s3c/cpu.c +Auto-merging arch/arm/mach-s3c/s3c64xx.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/video/fbdev/omap/lcdc.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/omap/lcdc.c +Auto-merging drivers/video/fbdev/omap/sossi.c +Auto-merging drivers/video/fbdev/pxafb.c +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'drivers/video/fbdev/omap/lcdc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7bb95c8c7cfa] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/syna.txt | 4 - + .../memory-controllers/renesas,rpc-if.yaml | 5 + + MAINTAINERS | 4 +- + arch/arm/Kconfig | 129 +-- + arch/arm/Kconfig.debug | 6 +- + arch/arm/Makefile | 9 +- + arch/arm/arm-soc-for-next-contents.txt | 107 +++ + .../uncompress.h => boot/compressed/misc-ep93xx.h} | 70 +- + arch/arm/boot/compressed/misc.c | 4 + + arch/arm/boot/dts/exynos3250.dtsi | 3 +- + arch/arm/boot/dts/exynos4.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 8 +- + arch/arm/boot/dts/exynos5250.dtsi | 8 +- + arch/arm/boot/dts/exynos5260.dtsi | 3 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 4 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 7 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 6 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 6 +- + arch/arm/boot/dts/exynos54xx.dtsi | 3 +- + arch/arm/boot/dts/nspire-classic.dtsi | 10 +- + arch/arm/boot/dts/nspire-cx.dts | 4 +- + arch/arm/boot/dts/nspire.dtsi | 60 +- + arch/arm/boot/dts/ox820.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 3 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 11 +- + arch/arm/boot/dts/s5pv210-goni.dts | 6 +- + arch/arm/boot/dts/s5pv210.dtsi | 40 +- + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- + arch/arm/common/locomo.c | 1 - + arch/arm/common/sa1111.c | 5 +- + arch/arm/configs/am200epdkit_defconfig | 1 + + arch/arm/configs/cm_x300_defconfig | 1 + + arch/arm/configs/colibri_pxa270_defconfig | 1 + + arch/arm/configs/colibri_pxa300_defconfig | 1 + + arch/arm/configs/corgi_defconfig | 1 + + arch/arm/configs/dove_defconfig | 2 + + arch/arm/configs/ep93xx_defconfig | 2 + + arch/arm/configs/eseries_pxa_defconfig | 1 + + arch/arm/configs/ezx_defconfig | 1 + + arch/arm/configs/h5000_defconfig | 1 + + arch/arm/configs/iop32x_defconfig | 1 + + arch/arm/configs/ixp4xx_defconfig | 1 + + arch/arm/configs/lpd270_defconfig | 1 + + arch/arm/configs/lubbock_defconfig | 1 + + arch/arm/configs/magician_defconfig | 1 + + arch/arm/configs/mainstone_defconfig | 1 + + arch/arm/configs/mini2440_defconfig | 2 + + arch/arm/configs/omap1_defconfig | 3 + + arch/arm/configs/palmz72_defconfig | 1 + + arch/arm/configs/pcm027_defconfig | 1 + + arch/arm/configs/pxa255-idp_defconfig | 1 + + arch/arm/configs/pxa3xx_defconfig | 1 + + arch/arm/configs/pxa_defconfig | 1 + + arch/arm/configs/s3c2410_defconfig | 3 + + arch/arm/configs/spitz_defconfig | 1 + + arch/arm/configs/tct_hammer_defconfig | 2 + + arch/arm/configs/trizeps4_defconfig | 1 + + arch/arm/configs/viper_defconfig | 1 + + arch/arm/configs/xcep_defconfig | 1 + + arch/arm/configs/zeus_defconfig | 1 + + arch/arm/include/asm/hardware/sa1111.h | 2 - + arch/arm/include/asm/io.h | 27 +- + arch/arm/mach-asm9260/Kconfig | 1 + + arch/arm/mach-aspeed/Kconfig | 2 +- + arch/arm/mach-at91/Kconfig | 3 +- + arch/arm/mach-clps711x/Kconfig | 1 + + arch/arm/mach-davinci/Kconfig | 1 + + arch/arm/mach-davinci/Makefile | 4 +- + arch/arm/mach-davinci/board-da830-evm.c | 7 +- + arch/arm/mach-davinci/board-da850-evm.c | 7 +- + arch/arm/mach-davinci/board-dm355-evm.c | 5 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 5 +- + arch/arm/mach-davinci/board-dm365-evm.c | 6 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 7 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 5 +- + arch/arm/mach-davinci/board-mityomapl138.c | 8 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 7 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 6 +- + arch/arm/mach-davinci/board-sffsdr.c | 6 +- + arch/arm/mach-davinci/common.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/common.h | 0 + arch/arm/mach-davinci/{include/mach => }/cputype.h | 2 +- + arch/arm/mach-davinci/da830.c | 11 +- + arch/arm/mach-davinci/da850.c | 12 +- + arch/arm/mach-davinci/da8xx-dt.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/da8xx.h | 5 +- + arch/arm/mach-davinci/davinci.h | 3 +- + arch/arm/mach-davinci/devices-da8xx.c | 7 +- + arch/arm/mach-davinci/devices.c | 7 +- + arch/arm/mach-davinci/dm355.c | 12 +- + arch/arm/mach-davinci/dm365.c | 12 +- + arch/arm/mach-davinci/dm644x.c | 12 +- + arch/arm/mach-davinci/dm646x.c | 12 +- + .../arm/mach-davinci/{include/mach => }/hardware.h | 0 + arch/arm/mach-davinci/include/mach/mux.h | 990 --------------------- + arch/arm/mach-davinci/include/mach/uncompress.h | 97 -- + arch/arm/mach-davinci/mux.c | 4 +- + arch/arm/mach-davinci/mux.h | 969 +++++++++++++++++++- + arch/arm/mach-davinci/pdata-quirks.c | 4 +- + arch/arm/mach-davinci/pm.c | 9 +- + arch/arm/mach-davinci/{include/mach => }/pm.h | 0 + arch/arm/mach-davinci/serial.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/serial.h | 2 +- + arch/arm/mach-davinci/sram.c | 2 +- + arch/arm/mach-davinci/usb-da8xx.c | 7 +- + arch/arm/mach-davinci/usb.c | 5 +- + arch/arm/mach-dove/Kconfig | 16 +- + arch/arm/mach-dove/Makefile | 2 + + arch/arm/mach-dove/include/mach/uncompress.h | 34 - + arch/arm/mach-ep93xx/Kconfig | 13 + + arch/arm/mach-ep93xx/adssphere.c | 1 + + arch/arm/mach-ep93xx/core.c | 5 +- + arch/arm/mach-ep93xx/edb93xx.c | 8 + + .../mach-ep93xx/{include/mach => }/ep93xx-regs.h | 4 - + arch/arm/mach-ep93xx/gesbc9312.c | 1 + + arch/arm/mach-ep93xx/gpio-ep93xx.h | 2 +- + arch/arm/mach-ep93xx/include/mach/irqs.h | 79 -- + arch/arm/mach-ep93xx/irqs.h | 76 ++ + arch/arm/mach-ep93xx/micro9.c | 4 + + arch/arm/mach-ep93xx/simone.c | 1 + + arch/arm/mach-ep93xx/snappercl15.c | 1 + + arch/arm/mach-ep93xx/soc.h | 3 +- + arch/arm/mach-ep93xx/ts72xx.c | 3 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 1 + + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-gemini/Kconfig | 1 + + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-hisi/Kconfig | 2 +- + arch/arm/mach-imx/Kconfig | 4 +- + arch/arm/mach-integrator/Kconfig | 125 --- + arch/arm/mach-integrator/Makefile | 10 - + arch/arm/mach-iop32x/Kconfig | 18 +- + arch/arm/mach-iop32x/em7210.c | 1 + + arch/arm/mach-iop32x/glantank.c | 1 + + arch/arm/mach-iop32x/include/mach/irqs.h | 14 - + arch/arm/mach-iop32x/include/mach/uncompress.h | 25 - + arch/arm/mach-iop32x/iq31244.c | 1 + + arch/arm/mach-iop32x/iq80321.c | 1 + + arch/arm/mach-iop32x/irqs.h | 2 + + arch/arm/mach-iop32x/n2100.c | 1 + + arch/arm/mach-ixp4xx/Kconfig | 22 +- + arch/arm/mach-ixp4xx/Makefile.boot | 4 - + arch/arm/mach-ixp4xx/include/mach/uncompress.h | 54 -- + arch/arm/mach-keystone/Kconfig | 1 - + arch/arm/mach-lpc32xx/Kconfig | 1 + + arch/arm/mach-mmp/Kconfig | 12 +- + arch/arm/mach-mmp/Makefile | 1 - + arch/arm/mach-mmp/devices.c | 2 +- + arch/arm/mach-mmp/devices.h | 10 +- + arch/arm/mach-mmp/mfp.h | 2 +- + arch/arm/mach-mmp/mmp2.h | 48 +- + arch/arm/mach-mmp/pxa168.h | 60 +- + arch/arm/mach-mmp/pxa910.h | 38 +- + arch/arm/mach-mmp/tavorevb.c | 113 --- + arch/arm/mach-mmp/ttc_dkb.c | 6 +- + arch/arm/mach-moxart/Kconfig | 1 + + arch/arm/mach-mv78xx0/Kconfig | 1 + + arch/arm/mach-mvebu/Kconfig | 3 +- + arch/arm/mach-mxs/Kconfig | 1 + + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-npcm/Kconfig | 2 +- + arch/arm/mach-nspire/Kconfig | 1 + + arch/arm/mach-omap1/Kconfig | 72 ++ + arch/arm/mach-omap1/Makefile | 6 +- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 2 + + arch/arm/mach-omap1/ams-delta-fiq.h | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 20 +- + arch/arm/mach-omap1/board-fsample.c | 10 +- + arch/arm/mach-omap1/board-generic.c | 8 +- + arch/arm/mach-omap1/board-h2.c | 14 +- + arch/arm/mach-omap1/board-h3.c | 16 +- + arch/arm/mach-omap1/board-htcherald.c | 12 +- + arch/arm/mach-omap1/board-innovator.c | 34 +- + arch/arm/mach-omap1/board-nokia770.c | 8 +- + arch/arm/mach-omap1/board-osk.c | 49 +- + arch/arm/mach-omap1/board-palmte.c | 14 +- + arch/arm/mach-omap1/board-palmtt.c | 14 +- + arch/arm/mach-omap1/board-palmz71.c | 14 +- + arch/arm/mach-omap1/board-perseus2.c | 15 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 3 +- + arch/arm/mach-omap1/board-sx1.c | 12 +- + arch/arm/mach-omap1/clock.c | 797 +++++++---------- + arch/arm/mach-omap1/clock.h | 191 +--- + arch/arm/mach-omap1/clock_data.c | 510 +++++------ + arch/arm/mach-omap1/common.h | 3 +- + arch/arm/mach-omap1/devices.c | 12 +- + arch/arm/mach-omap1/dma.c | 2 +- + arch/arm/mach-omap1/fb.c | 19 +- + arch/arm/mach-omap1/flash.c | 5 +- + arch/arm/mach-omap1/fpga.c | 3 +- + arch/arm/mach-omap1/gpio15xx.c | 3 +- + arch/arm/mach-omap1/gpio16xx.c | 5 +- + arch/arm/mach-omap1/gpio7xx.c | 3 +- + arch/arm/mach-omap1/{include/mach => }/hardware.h | 136 +-- + arch/arm/mach-omap1/i2c.c | 4 +- + arch/arm/mach-omap1/id.c | 5 +- + arch/arm/mach-omap1/include/mach/io.h | 45 - + arch/arm/mach-omap1/include/mach/lcdc.h | 44 - + arch/arm/mach-omap1/include/mach/memory.h | 12 - + arch/arm/mach-omap1/include/mach/uncompress.h | 117 --- + arch/arm/mach-omap1/io.c | 12 +- + arch/arm/mach-omap1/irq.c | 4 +- + arch/arm/mach-omap1/{include/mach => }/irqs.h | 2 - + arch/arm/mach-omap1/mcbsp.c | 17 +- + arch/arm/mach-omap1/{include/mach => }/mtd-xip.h | 3 +- + arch/arm/mach-omap1/mux.c | 6 +- + arch/arm/mach-omap1/mux.h | 144 +++ + arch/arm/mach-omap1/ocpi.c | 8 +- + .../arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 269 ++---- + arch/arm/mach-omap1/{include/mach => }/omap1510.h | 0 + arch/arm/mach-omap1/{include/mach => }/omap16xx.h | 0 + arch/arm/mach-omap1/{include/mach => }/omap7xx.h | 0 + arch/arm/mach-omap1/pm.c | 9 +- + arch/arm/mach-omap1/pm.h | 2 + + arch/arm/mach-omap1/reset.c | 3 +- + arch/arm/mach-omap1/serial.c | 10 +- + arch/arm/mach-omap1/{include/mach => }/serial.h | 0 + arch/arm/mach-omap1/sleep.S | 2 +- + arch/arm/mach-omap1/soc.h | 6 +- + arch/arm/mach-omap1/sram-init.c | 91 +- + arch/arm/mach-omap1/sram.S | 4 +- + arch/arm/mach-omap1/sram.h | 4 +- + arch/arm/mach-omap1/{include/mach => }/tc.h | 2 - + arch/arm/mach-omap1/time.c | 7 +- + arch/arm/mach-omap1/timer.c | 1 + + arch/arm/mach-omap1/timer32k.c | 100 ++- + arch/arm/mach-omap1/usb.c | 8 +- + arch/arm/mach-omap1/usb.h | 25 + + arch/arm/mach-omap2/Kconfig | 49 + + arch/arm/mach-omap2/Makefile | 3 - + arch/arm/mach-omap2/common.h | 13 +- + arch/arm/mach-omap2/dma.c | 1 + + arch/arm/mach-omap2/include/mach/hardware.h | 3 - + arch/arm/mach-omap2/include/mach/irqs.h | 3 - + arch/arm/mach-omap2/include/mach/serial.h | 66 -- + arch/arm/mach-omap2/omap-iommu.c | 1 + + arch/arm/mach-omap2/omap-secure.c | 2 +- + arch/arm/mach-omap2/omap-secure.h | 2 +- + arch/arm/mach-omap2/omap4-common.c | 2 +- + arch/arm/mach-omap2/pdata-quirks.c | 11 - + arch/arm/mach-omap2/serial.h | 67 +- + arch/arm/mach-omap2/sram.c | 91 +- + arch/arm/mach-omap2/sram.h | 5 +- + arch/arm/mach-orion5x/Kconfig | 1 + + arch/arm/mach-oxnas/Kconfig | 2 +- + arch/arm/mach-pxa/Kconfig | 15 + + arch/arm/mach-pxa/Makefile | 18 +- + arch/arm/mach-pxa/Makefile.boot | 3 - + arch/arm/mach-pxa/{include/mach => }/addr-map.h | 0 + arch/arm/mach-pxa/am300epd.c | 2 +- + .../arm/mach-pxa/balloon3-pcmcia.c | 4 +- + arch/arm/mach-pxa/balloon3.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/balloon3.h | 0 + arch/arm/mach-pxa/cm-x300.c | 12 +- + arch/arm/mach-pxa/colibri-evalboard.c | 1 - + .../arm/mach-pxa/colibri-pcmcia.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 1 - + arch/arm/mach-pxa/colibri-pxa270.c | 2 +- + arch/arm/mach-pxa/colibri-pxa300.c | 3 +- + arch/arm/mach-pxa/colibri-pxa320.c | 2 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 3 +- + arch/arm/mach-pxa/colibri.h | 2 +- + arch/arm/mach-pxa/corgi.c | 23 +- + arch/arm/mach-pxa/{include/mach => }/corgi.h | 0 + arch/arm/mach-pxa/corgi_pm.c | 5 +- + arch/arm/mach-pxa/csb726.c | 5 +- + arch/arm/mach-pxa/csb726.h | 2 +- + arch/arm/mach-pxa/devices.c | 17 +- + .../arm/mach-pxa/e740-pcmcia.c | 4 +- + .../arm/mach-pxa/{include/mach => }/eseries-gpio.h | 0 + arch/arm/mach-pxa/eseries.c | 36 +- + arch/arm/mach-pxa/ezx.c | 1 - + arch/arm/mach-pxa/generic.c | 62 +- + arch/arm/mach-pxa/generic.h | 9 - + arch/arm/mach-pxa/gumstix.c | 1 - + arch/arm/mach-pxa/gumstix.h | 2 +- + arch/arm/mach-pxa/h5000.c | 2 +- + .../arm/mach-pxa/hx4700-pcmcia.c | 4 +- + arch/arm/mach-pxa/hx4700.c | 18 +- + arch/arm/mach-pxa/{include/mach => }/hx4700.h | 0 + arch/arm/mach-pxa/idp.c | 2 - + arch/arm/mach-pxa/idp.h | 2 +- + arch/arm/mach-pxa/include/mach/bitfield.h | 114 --- + arch/arm/mach-pxa/include/mach/dma.h | 17 - + arch/arm/mach-pxa/include/mach/generic.h | 1 - + arch/arm/mach-pxa/include/mach/mtd-xip.h | 36 - + arch/arm/mach-pxa/include/mach/uncompress.h | 70 -- + arch/arm/mach-pxa/irq.c | 5 +- + arch/arm/mach-pxa/{include/mach => }/irqs.h | 0 + arch/arm/mach-pxa/littleton.c | 1 - + arch/arm/mach-pxa/lpd270.c | 6 +- + arch/arm/mach-pxa/lubbock.c | 17 +- + arch/arm/mach-pxa/{include/mach => }/lubbock.h | 4 +- + arch/arm/mach-pxa/magician.c | 56 +- + arch/arm/mach-pxa/{include/mach => }/magician.h | 2 +- + arch/arm/mach-pxa/mainstone.c | 17 +- + arch/arm/mach-pxa/{include/mach => }/mainstone.h | 4 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +- + arch/arm/mach-pxa/mfp-pxa2xx.h | 2 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 3 +- + arch/arm/mach-pxa/mfp-pxa3xx.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 4 +- + arch/arm/mach-pxa/mxm8x10.c | 8 +- + arch/arm/mach-pxa/palm27x.c | 2 +- + .../arm/mach-pxa/palmld-pcmcia.c | 5 +- + arch/arm/mach-pxa/palmld.c | 23 +- + arch/arm/mach-pxa/{include/mach => }/palmld.h | 0 + arch/arm/mach-pxa/palmt5.c | 11 +- + arch/arm/mach-pxa/palmt5.h | 2 +- + .../arm/mach-pxa/palmtc-pcmcia.c | 4 +- + arch/arm/mach-pxa/palmtc.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/palmtc.h | 0 + arch/arm/mach-pxa/palmte2.c | 2 +- + arch/arm/mach-pxa/palmtreo.c | 4 +- + .../arm/mach-pxa/palmtx-pcmcia.c | 4 +- + arch/arm/mach-pxa/palmtx.c | 13 +- + arch/arm/mach-pxa/{include/mach => }/palmtx.h | 0 + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pcm027.h | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/pcm990_baseboard.h | 2 +- + arch/arm/mach-pxa/poodle.c | 31 +- + arch/arm/mach-pxa/{include/mach => }/poodle.h | 2 - + arch/arm/mach-pxa/pxa-dt.c | 2 +- + arch/arm/mach-pxa/pxa-regs.h | 52 ++ + arch/arm/mach-pxa/pxa25x.c | 12 +- + arch/arm/mach-pxa/pxa25x.h | 6 +- + arch/arm/mach-pxa/pxa27x-udc.h | 2 + + arch/arm/mach-pxa/pxa27x.c | 12 +- + arch/arm/mach-pxa/pxa27x.h | 6 +- + arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h | 47 +- + arch/arm/mach-pxa/pxa2xx.c | 32 +- + arch/arm/mach-pxa/pxa300.c | 1 + + arch/arm/mach-pxa/pxa320.c | 1 + + arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h | 71 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 19 +- + arch/arm/mach-pxa/pxa3xx.h | 6 +- + arch/arm/mach-pxa/pxa930.c | 1 + + arch/arm/mach-pxa/{include/mach => }/regs-ost.h | 4 +- + arch/arm/mach-pxa/regs-rtc.h | 2 +- + arch/arm/mach-pxa/regs-u2d.h | 2 - + arch/arm/mach-pxa/{include/mach => }/regs-uart.h | 2 + + arch/arm/mach-pxa/reset.c | 9 +- + arch/arm/mach-pxa/{include/mach => }/reset.h | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-pxa/sleep.S | 9 +- + arch/arm/mach-pxa/smemc.c | 13 +- + arch/arm/mach-pxa/{include/mach => }/smemc.h | 0 + arch/arm/mach-pxa/spitz.c | 37 +- + arch/arm/mach-pxa/{include/mach => }/spitz.h | 0 + arch/arm/mach-pxa/spitz_pm.c | 3 +- + arch/arm/mach-pxa/standby.S | 3 +- + arch/arm/mach-pxa/tosa.c | 47 +- + arch/arm/mach-pxa/{include/mach => }/tosa.h | 0 + .../arm/mach-pxa/trizeps4-pcmcia.c | 6 +- + arch/arm/mach-pxa/trizeps4.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/trizeps4.h | 1 + + .../arm/mach-pxa/viper-pcmcia.c | 6 +- + .../arm/mach-pxa/viper-pcmcia.h | 0 + arch/arm/mach-pxa/viper.c | 20 +- + .../arm/mach-pxa/vpac270-pcmcia.c | 4 +- + arch/arm/mach-pxa/vpac270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/vpac270.h | 0 + arch/arm/mach-pxa/xcep.c | 4 +- + arch/arm/mach-pxa/z2.c | 13 +- + arch/arm/mach-pxa/{include/mach => }/z2.h | 0 + arch/arm/mach-pxa/zeus.c | 20 +- + arch/arm/mach-pxa/zylonite.c | 34 +- + arch/arm/mach-pxa/zylonite.h | 2 + + arch/arm/mach-pxa/zylonite_pxa300.c | 1 + + arch/arm/mach-pxa/zylonite_pxa320.c | 1 + + arch/arm/mach-qcom/Kconfig | 1 - + arch/arm/mach-realview/Kconfig | 103 --- + arch/arm/mach-realview/Makefile | 8 - + arch/arm/mach-s3c/Kconfig.s3c24xx | 29 +- + arch/arm/mach-s3c/Makefile | 2 - + arch/arm/mach-s3c/Makefile.s3c64xx | 3 - + arch/arm/mach-s3c/bast-ide.c | 2 +- + arch/arm/mach-s3c/bast-irq.c | 2 +- + arch/arm/mach-s3c/cpu.c | 2 +- + arch/arm/mach-s3c/dev-audio-s3c64xx.c | 2 +- + arch/arm/mach-s3c/dev-uart-s3c64xx.c | 2 +- + arch/arm/mach-s3c/devs.c | 2 +- + arch/arm/mach-s3c/gpio-samsung.c | 2 +- + arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 -- + arch/arm/mach-s3c/include/mach/io.h | 8 - + arch/arm/mach-s3c/irq-pm-s3c24xx.c | 2 +- + arch/arm/mach-s3c/irq-s3c24xx.c | 2 +- + .../arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h | 18 +- + .../arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h | 0 + arch/arm/mach-s3c/{include/mach => }/irqs.h | 0 + arch/arm/mach-s3c/mach-amlm5900.c | 2 + + arch/arm/mach-s3c/mach-anubis.c | 6 +- + arch/arm/mach-s3c/mach-anw6410.c | 2 +- + arch/arm/mach-s3c/mach-at2440evb.c | 1 + + arch/arm/mach-s3c/mach-bast.c | 6 +- + arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- + arch/arm/mach-s3c/mach-crag6410.c | 2 +- + arch/arm/mach-s3c/mach-gta02.c | 1 + + arch/arm/mach-s3c/mach-h1940.c | 1 + + arch/arm/mach-s3c/mach-hmt.c | 2 +- + arch/arm/mach-s3c/mach-jive.c | 2 +- + arch/arm/mach-s3c/mach-mini2440.c | 3 +- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm/mach-s3c/mach-n30.c | 2 + + arch/arm/mach-s3c/mach-ncp.c | 2 +- + arch/arm/mach-s3c/mach-nexcoder.c | 1 + + arch/arm/mach-s3c/mach-osiris.c | 6 +- + arch/arm/mach-s3c/mach-otom.c | 1 + + arch/arm/mach-s3c/mach-qt2410.c | 1 + + arch/arm/mach-s3c/mach-real6410.c | 2 +- + arch/arm/mach-s3c/mach-rx1950.c | 1 + + arch/arm/mach-s3c/mach-rx3715.c | 7 +- + arch/arm/mach-s3c/mach-smartq5.c | 2 +- + arch/arm/mach-s3c/mach-smartq7.c | 2 +- + arch/arm/mach-s3c/mach-smdk2410.c | 1 + + arch/arm/mach-s3c/mach-smdk2413.c | 3 + + arch/arm/mach-s3c/mach-smdk2416.c | 11 +- + arch/arm/mach-s3c/mach-smdk2440.c | 11 +- + arch/arm/mach-s3c/mach-smdk2443.c | 12 +- + arch/arm/mach-s3c/mach-smdk6400.c | 2 +- + arch/arm/mach-s3c/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c/mach-tct_hammer.c | 1 + + arch/arm/mach-s3c/mach-vr1000.c | 6 +- + arch/arm/mach-s3c/mach-vstms.c | 1 + + arch/arm/mach-s3c/{include/mach => }/map-base.h | 6 + + arch/arm/mach-s3c/map-s3c24xx.h | 2 +- + arch/arm/mach-s3c/map-s3c64xx.h | 2 +- + arch/arm/mach-s3c/pl080.c | 2 +- + arch/arm/mach-s3c/pm-core-s3c24xx.h | 2 +- + arch/arm/mach-s3c/pm-s3c2412.c | 2 +- + arch/arm/mach-s3c/pm-s3c64xx.c | 2 +- + arch/arm/mach-s3c/pm.c | 2 +- + arch/arm/mach-s3c/s3c2443.c | 2 +- + arch/arm/mach-s3c/s3c24xx.h | 2 +- + arch/arm/mach-s3c/s3c64xx.c | 2 +- + arch/arm/mach-s3c/simtec-usb.c | 2 +- + arch/arm/mach-sa1100/generic.c | 6 +- + arch/arm/mach-sa1100/include/mach/reset.h | 1 - + arch/arm/mach-socfpga/Kconfig | 1 - + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-spear/Makefile | 2 - + arch/arm/mach-spear/include/mach/irqs.h | 35 - + arch/arm/mach-spear/include/mach/uncompress.h | 42 - + arch/arm/mach-spear/{include/mach => }/misc_regs.h | 4 +- + arch/arm/mach-spear/pl080.c | 4 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-spear/restart.c | 2 +- + arch/arm/mach-spear/{include/mach => }/spear.h | 0 + arch/arm/mach-spear/spear1310.c | 2 +- + arch/arm/mach-spear/spear13xx.c | 2 +- + arch/arm/mach-spear/spear300.c | 2 +- + arch/arm/mach-spear/spear310.c | 2 +- + arch/arm/mach-spear/spear320.c | 2 +- + arch/arm/mach-spear/spear3xx.c | 4 +- + arch/arm/mach-spear/spear6xx.c | 4 +- + arch/arm/mach-sunxi/Kconfig | 3 +- + arch/arm/mach-versatile/Kconfig | 309 +++++++ + arch/arm/mach-versatile/Makefile | 32 +- + .../Makefile.boot | 0 + arch/arm/{mach-vexpress => mach-versatile}/dcscb.c | 4 +- + .../dcscb_setup.S | 2 - + .../{plat-versatile => mach-versatile}/headsmp.S | 2 - + .../{plat-versatile => mach-versatile}/hotplug.c | 2 +- + .../cm.h => mach-versatile/integrator-cm.h} | 0 + .../integrator-hardware.h} | 0 + .../core.c => mach-versatile/integrator.c} | 8 +- + .../common.h => mach-versatile/integrator.h} | 0 + .../integrator_ap.c | 13 +- + .../integrator_cp.c | 8 +- + .../platsmp-realview.c} | 2 +- + .../platsmp-vexpress.c} | 7 +- + .../{plat-versatile => mach-versatile}/platsmp.c | 4 +- + .../include/plat => mach-versatile}/platsmp.h | 2 - + .../realview-dt.c => mach-versatile/realview.c} | 0 + arch/arm/{mach-vexpress => mach-versatile}/spc.c | 0 + arch/arm/{mach-vexpress => mach-versatile}/spc.h | 0 + .../arm/{mach-vexpress => mach-versatile}/tc2_pm.c | 2 - + .../{mach-vexpress => mach-versatile}/v2m-mps2.c | 0 + arch/arm/{mach-vexpress => mach-versatile}/v2m.c | 2 +- + .../mach-versatile/{versatile_dt.c => versatile.c} | 0 + .../core.h => mach-versatile/vexpress.h} | 0 + arch/arm/mach-vexpress/Kconfig | 81 -- + arch/arm/mach-vexpress/Makefile | 19 - + arch/arm/mach-vt8500/Kconfig | 1 + + arch/arm/mach-zynq/Kconfig | 1 - + arch/arm/mm/Kconfig | 28 +- + arch/arm/mm/copypage-xsc3.c | 2 + + arch/arm/mm/ioremap.c | 2 +- + arch/arm/plat-omap/Kconfig | 119 --- + arch/arm/plat-omap/Makefile | 13 - + arch/arm/plat-omap/counter_32k.c | 114 --- + arch/arm/plat-omap/debug-leds.c | 171 ---- + arch/arm/plat-omap/include/plat/counter-32k.h | 1 - + arch/arm/plat-omap/include/plat/cpu.h | 21 - + arch/arm/plat-omap/include/plat/sram.h | 8 - + arch/arm/plat-omap/sram.c | 129 --- + arch/arm/plat-versatile/Makefile | 5 - + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 3 +- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 5 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 19 +- + arch/arm64/boot/dts/synaptics/as370.dtsi | 173 ---- + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 +- + arch/mips/alchemy/devboards/db1300.c | 9 - + drivers/ata/pata_palmld.c | 3 +- + drivers/clk/pxa/clk-pxa.c | 8 +- + drivers/clk/pxa/clk-pxa.h | 9 +- + drivers/clk/pxa/clk-pxa25x.c | 46 +- + drivers/clk/pxa/clk-pxa27x.c | 68 +- + drivers/clk/pxa/clk-pxa2xx.h | 58 ++ + drivers/clk/pxa/clk-pxa3xx.c | 139 ++- + drivers/clocksource/timer-ti-dm.c | 2 +- + drivers/cpufreq/pxa2xx-cpufreq.c | 6 +- + drivers/cpufreq/pxa3xx-cpufreq.c | 65 +- + drivers/dma/ti/omap-dma.c | 19 +- + drivers/input/keyboard/omap-keypad.c | 1 + + drivers/input/mouse/pxa930_trkball.c | 1 - + drivers/input/touchscreen/Kconfig | 2 + + drivers/input/touchscreen/mainstone-wm97xx.c | 130 ++- + drivers/input/touchscreen/wm97xx-core.c | 42 +- + drivers/input/touchscreen/zylonite-wm97xx.c | 43 +- + drivers/leds/leds-locomo.c | 1 - + drivers/memory/emif.c | 11 +- + drivers/memory/fsl-corenet-cf.c | 9 +- + drivers/memory/renesas-rpc-if.c | 28 +- + drivers/memory/samsung/exynos5422-dmc.c | 5 +- + drivers/mmc/host/omap.c | 23 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 - + drivers/pcmcia/Kconfig | 3 +- + drivers/pcmcia/Makefile | 13 - + drivers/pcmcia/omap_cf.c | 48 +- + drivers/pcmcia/pxa2xx_base.c | 48 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 3 +- + drivers/pcmcia/sa1111_generic.c | 1 - + drivers/pcmcia/sa1111_lubbock.c | 1 - + drivers/pcmcia/soc_common.c | 27 +- + drivers/pcmcia/soc_common.h | 120 +-- + drivers/power/supply/tosa_battery.c | 191 ++-- + drivers/rtc/rtc-pxa.c | 2 - + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig | 5 +- + {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile | 4 - + {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c | 2 +- + {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c | 0 + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-omap-uwire.c | 15 +- + drivers/tty/serial/8250/8250.h | 1 + + drivers/usb/gadget/udc/omap_udc.c | 19 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 37 +- + drivers/usb/gadget/udc/pxa25x_udc.h | 7 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ohci-omap.c | 60 +- + drivers/usb/host/ohci-pxa27x.c | 3 +- + drivers/usb/phy/Kconfig | 3 +- + drivers/usb/phy/phy-isp1301-omap.c | 6 +- + drivers/video/backlight/Kconfig | 4 +- + drivers/video/backlight/omap1_bl.c | 4 +- + drivers/video/fbdev/Makefile | 2 +- + drivers/video/fbdev/omap/Kconfig | 4 +- + drivers/video/fbdev/omap/Makefile | 5 + + drivers/video/fbdev/omap/lcd_ams_delta.c | 6 +- + .../video/fbdev/omap}/lcd_dma.c | 7 +- + .../mach => drivers/video/fbdev/omap}/lcd_dma.h | 2 - + drivers/video/fbdev/omap/lcd_inn1510.c | 9 +- + drivers/video/fbdev/omap/lcd_osk.c | 4 +- + drivers/video/fbdev/omap/lcdc.c | 10 +- + drivers/video/fbdev/omap/lcdc.h | 35 + + drivers/video/fbdev/omap/omapfb.h | 2 + + drivers/video/fbdev/omap/omapfb_main.c | 19 +- + drivers/video/fbdev/omap/sossi.c | 4 +- + .../video/fbdev/pxa3xx-regs.h | 24 +- + drivers/video/fbdev/pxafb.c | 4 +- + drivers/watchdog/sa1100_wdt.c | 88 +- + include/linux/clk/pxa.h | 16 + + include/linux/omap-dma.h | 35 +- + include/linux/platform_data/asoc-poodle.h | 16 + + .../linux/platform_data/asoc-pxa.h | 4 +- + include/linux/platform_data/usb-omap1.h | 2 + + include/linux/platform_data/video-pxafb.h | 22 +- + .../mach/hardware.h => include/linux/soc/pxa/cpu.h | 61 +- + .../include/plat => include/linux/soc/pxa}/mfp.h | 6 +- + include/linux/soc/pxa/smemc.h | 13 + + include/linux/soc/ti/omap1-io.h | 143 +++ + .../mach/mux.h => include/linux/soc/ti/omap1-mux.h | 142 +-- + .../mach/soc.h => include/linux/soc/ti/omap1-soc.h | 22 - + .../mach/usb.h => include/linux/soc/ti/omap1-usb.h | 28 +- + include/linux/wm97xx.h | 4 - + include/pcmcia/soc_common.h | 125 +++ + include/sound/pxa2xx-lib.h | 4 + + sound/arm/pxa2xx-ac97-lib.c | 145 +-- + .../regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h | 42 +- + sound/arm/pxa2xx-ac97.c | 3 +- + sound/soc/pxa/corgi.c | 43 +- + sound/soc/pxa/e740_wm9705.c | 37 +- + sound/soc/pxa/e750_wm9705.c | 33 +- + sound/soc/pxa/e800_wm9712.c | 33 +- + sound/soc/pxa/em-x270.c | 2 +- + sound/soc/pxa/hx4700.c | 34 +- + sound/soc/pxa/magician.c | 141 +-- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/palm27x.c | 2 +- + sound/soc/pxa/poodle.c | 51 +- + sound/soc/pxa/pxa2xx-ac97.c | 24 +- + sound/soc/pxa/pxa2xx-i2s.c | 112 ++- + sound/soc/pxa/spitz.c | 58 +- + sound/soc/pxa/tosa.c | 18 +- + sound/soc/pxa/z2.c | 8 +- + sound/soc/ti/osk5912.c | 4 +- + 615 files changed, 5891 insertions(+), 7271 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + rename arch/arm/{mach-ep93xx/include/mach/uncompress.h => boot/compressed/misc-ep93xx.h} (51%) + rename arch/arm/mach-davinci/{include/mach => }/common.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/cputype.h (98%) + rename arch/arm/mach-davinci/{include/mach => }/da8xx.h (99%) + rename arch/arm/mach-davinci/{include/mach => }/hardware.h (100%) + delete mode 100644 arch/arm/mach-davinci/include/mach/mux.h + delete mode 100644 arch/arm/mach-davinci/include/mach/uncompress.h + rename arch/arm/mach-davinci/{include/mach => }/pm.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/serial.h (97%) + delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h + rename arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h (94%) + delete mode 100644 arch/arm/mach-ep93xx/include/mach/irqs.h + create mode 100644 arch/arm/mach-ep93xx/irqs.h + delete mode 100644 arch/arm/mach-integrator/Kconfig + delete mode 100644 arch/arm/mach-integrator/Makefile + delete mode 100644 arch/arm/mach-iop32x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ixp4xx/Makefile.boot + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-mmp/tavorevb.c + rename arch/arm/mach-omap1/{include/mach => }/hardware.h (59%) + delete mode 100644 arch/arm/mach-omap1/include/mach/io.h + delete mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h + delete mode 100644 arch/arm/mach-omap1/include/mach/memory.h + delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h + rename arch/arm/mach-omap1/{include/mach => }/irqs.h (99%) + rename arch/arm/mach-omap1/{include/mach => }/mtd-xip.h (97%) + create mode 100644 arch/arm/mach-omap1/mux.h + rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (83%) + rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/tc.h (98%) + create mode 100644 arch/arm/mach-omap1/usb.h + delete mode 100644 arch/arm/mach-omap2/include/mach/hardware.h + delete mode 100644 arch/arm/mach-omap2/include/mach/irqs.h + delete mode 100644 arch/arm/mach-omap2/include/mach/serial.h + delete mode 100644 arch/arm/mach-pxa/Makefile.boot + rename arch/arm/mach-pxa/{include/mach => }/addr-map.h (100%) + rename drivers/pcmcia/pxa2xx_balloon3.c => arch/arm/mach-pxa/balloon3-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/balloon3.h (100%) + rename drivers/pcmcia/pxa2xx_colibri.c => arch/arm/mach-pxa/colibri-pcmcia.c (99%) + rename arch/arm/mach-pxa/{include/mach => }/corgi.h (100%) + rename drivers/pcmcia/pxa2xx_e740.c => arch/arm/mach-pxa/e740-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/eseries-gpio.h (100%) + rename drivers/pcmcia/pxa2xx_hx4700.c => arch/arm/mach-pxa/hx4700-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/hx4700.h (100%) + delete mode 100644 arch/arm/mach-pxa/include/mach/bitfield.h + delete mode 100644 arch/arm/mach-pxa/include/mach/dma.h + delete mode 100644 arch/arm/mach-pxa/include/mach/generic.h + delete mode 100644 arch/arm/mach-pxa/include/mach/mtd-xip.h + delete mode 100644 arch/arm/mach-pxa/include/mach/uncompress.h + rename arch/arm/mach-pxa/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/lubbock.h (95%) + rename arch/arm/mach-pxa/{include/mach => }/magician.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mainstone.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/mfp.h (91%) + rename drivers/pcmcia/pxa2xx_palmld.c => arch/arm/mach-pxa/palmld-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmld.h (100%) + rename drivers/pcmcia/pxa2xx_palmtc.c => arch/arm/mach-pxa/palmtc-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmtc.h (100%) + rename drivers/pcmcia/pxa2xx_palmtx.c => arch/arm/mach-pxa/palmtx-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmtx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/poodle.h (98%) + create mode 100644 arch/arm/mach-pxa/pxa-regs.h + rename arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h (76%) + rename arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h (61%) + rename arch/arm/mach-pxa/{include/mach => }/regs-ost.h (94%) + rename arch/arm/mach-pxa/{include/mach => }/regs-uart.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/reset.h (92%) + rename arch/arm/mach-pxa/{include/mach => }/smemc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/spitz.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/tosa.h (100%) + rename drivers/pcmcia/pxa2xx_trizeps4.c => arch/arm/mach-pxa/trizeps4-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/trizeps4.h (99%) + rename drivers/pcmcia/pxa2xx_viper.c => arch/arm/mach-pxa/viper-pcmcia.c (97%) + rename include/linux/platform_data/pcmcia-pxa2xx_viper.h => arch/arm/mach-pxa/viper-pcmcia.h (100%) + rename drivers/pcmcia/pxa2xx_vpac270.c => arch/arm/mach-pxa/vpac270-pcmcia.c (98%) + rename arch/arm/mach-pxa/{include/mach => }/vpac270.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/z2.h (100%) + delete mode 100644 arch/arm/mach-realview/Kconfig + delete mode 100644 arch/arm/mach-realview/Makefile + delete mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/include/mach/io.h + rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h (95%) + rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h (100%) + rename arch/arm/mach-s3c/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-s3c/{include/mach => }/map-base.h (87%) + delete mode 100644 arch/arm/mach-spear/include/mach/irqs.h + delete mode 100644 arch/arm/mach-spear/include/mach/uncompress.h + rename arch/arm/mach-spear/{include/mach => }/misc_regs.h (87%) + rename arch/arm/mach-spear/{include/mach => }/spear.h (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/Makefile.boot (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/dcscb.c (97%) + rename arch/arm/{mach-vexpress => mach-versatile}/dcscb_setup.S (95%) + rename arch/arm/{plat-versatile => mach-versatile}/headsmp.S (94%) + rename arch/arm/{plat-versatile => mach-versatile}/hotplug.c (98%) + rename arch/arm/{mach-integrator/cm.h => mach-versatile/integrator-cm.h} (100%) + rename arch/arm/{mach-integrator/hardware.h => mach-versatile/integrator-hardware.h} (100%) + rename arch/arm/{mach-integrator/core.c => mach-versatile/integrator.c} (95%) + rename arch/arm/{mach-integrator/common.h => mach-versatile/integrator.h} (100%) + rename arch/arm/{mach-integrator => mach-versatile}/integrator_ap.c (95%) + rename arch/arm/{mach-integrator => mach-versatile}/integrator_cp.c (96%) + rename arch/arm/{mach-realview/platsmp-dt.c => mach-versatile/platsmp-realview.c} (98%) + rename arch/arm/{mach-vexpress/platsmp.c => mach-versatile/platsmp-vexpress.c} (96%) + rename arch/arm/{plat-versatile => mach-versatile}/platsmp.c (97%) + rename arch/arm/{plat-versatile/include/plat => mach-versatile}/platsmp.h (87%) + rename arch/arm/{mach-realview/realview-dt.c => mach-versatile/realview.c} (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/spc.c (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/spc.h (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/tc2_pm.c (99%) + rename arch/arm/{mach-vexpress => mach-versatile}/v2m-mps2.c (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/v2m.c (97%) + rename arch/arm/mach-versatile/{versatile_dt.c => versatile.c} (100%) + rename arch/arm/{mach-vexpress/core.h => mach-versatile/vexpress.h} (100%) + delete mode 100644 arch/arm/mach-vexpress/Kconfig + delete mode 100644 arch/arm/mach-vexpress/Makefile + delete mode 100644 arch/arm/plat-omap/Kconfig + delete mode 100644 arch/arm/plat-omap/Makefile + delete mode 100644 arch/arm/plat-omap/counter_32k.c + delete mode 100644 arch/arm/plat-omap/debug-leds.c + delete mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h + delete mode 100644 arch/arm/plat-omap/include/plat/cpu.h + delete mode 100644 arch/arm/plat-omap/include/plat/sram.h + delete mode 100644 arch/arm/plat-omap/sram.c + delete mode 100644 arch/arm/plat-versatile/Makefile + delete mode 100644 arch/arm64/boot/dts/synaptics/as370.dtsi + create mode 100644 drivers/clk/pxa/clk-pxa2xx.h + rename {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig (83%) + rename {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile (51%) + rename {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c (99%) + rename {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c (100%) + rename {arch/arm/mach-omap1 => drivers/video/fbdev/omap}/lcd_dma.c (98%) + rename {arch/arm/mach-omap1/include/mach => drivers/video/fbdev/omap}/lcd_dma.h (98%) + rename arch/arm/mach-pxa/include/mach/regs-lcd.h => drivers/video/fbdev/pxa3xx-regs.h (90%) + create mode 100644 include/linux/clk/pxa.h + create mode 100644 include/linux/platform_data/asoc-poodle.h + rename arch/arm/mach-pxa/include/mach/audio.h => include/linux/platform_data/asoc-pxa.h (93%) + rename arch/arm/mach-pxa/include/mach/hardware.h => include/linux/soc/pxa/cpu.h (75%) + rename {arch/arm/plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h (98%) + create mode 100644 include/linux/soc/pxa/smemc.h + create mode 100644 include/linux/soc/ti/omap1-io.h + rename arch/arm/mach-omap1/include/mach/mux.h => include/linux/soc/ti/omap1-mux.h (53%) + rename arch/arm/mach-omap1/include/mach/soc.h => include/linux/soc/ti/omap1-soc.h (90%) + rename arch/arm/mach-omap1/include/mach/usb.h => include/linux/soc/ti/omap1-usb.h (86%) + create mode 100644 include/pcmcia/soc_common.h + rename arch/arm/mach-pxa/include/mach/regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h (71%) +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (ed532523b458 Merge branch 'v5.18/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +- + arch/arm64/boot/dts/amlogic/Makefile | 38 +++++++++++----------- + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 16 ++++++--- + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 ++++ + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 33 +++++++++++++++++++ + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 +- + 11 files changed, 77 insertions(+), 30 deletions(-) +Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 19 +++++++++++++++++++ + 4 files changed, 50 insertions(+) +Merging at91/at91-next (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging drivers-memory/for-next (d2fd434f2e1c Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/memory/renesas-rpc-if.c +Merge made by the 'ort' strategy. + drivers/memory/Kconfig | 2 +- + drivers/memory/brcmstb_dpfe.c | 10 +++------- + drivers/memory/da8xx-ddrctl.c | 3 +-- + drivers/memory/emif.c | 4 +--- + drivers/memory/omap-gpmc.c | 43 ++++++++++++++++++++++------------------- + drivers/memory/renesas-rpc-if.c | 3 +-- + drivers/memory/tegra/mc.c | 4 +--- + drivers/memory/ti-aemif.c | 4 +--- + drivers/memory/ti-emif-pm.c | 6 +++--- + 9 files changed, 35 insertions(+), 44 deletions(-) +Merging imx-mxs/for-next (08021731ef7a Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 85 +- + arch/arm/boot/dts/Makefile | 12 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 2 +- + arch/arm/boot/dts/imx28-sps1.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 8 + + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 25 +- + arch/arm/boot/dts/imx51.dtsi | 6 + + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 113 ++ + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 110 +- + arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts | 46 + + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 152 +++ + arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 31 - + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 6 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 657 +--------- + arch/arm/boot/dts/imx6dl-vicut1.dts | 1 + + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-vicut1.dts | 5 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi | 44 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 771 ++++++++--- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 - + arch/arm/boot/dts/imx6qdl-vicut1-12inch.dtsi | 128 ++ + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 261 +--- + arch/arm/boot/dts/imx6qp-vicutp.dts | 1 + + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 4 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 +- + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +- + .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 3 +- + arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi | 211 +++ + arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts | 55 + + arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi | 37 + + arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi | 71 + + arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi | 71 + + arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi | 43 + + arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi | 48 + + arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts | 20 + + arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts | 20 + + arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi | 588 +++++++++ + arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi | 76 ++ + arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi | 76 ++ + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/ls1021a-iot.dts | 227 ++++ + arch/arm/boot/dts/mba6ulx.dtsi | 571 ++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/Makefile | 8 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 9 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 - + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi | 74 ++ + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 996 ++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 20 + + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 2 +- + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 321 +++++ + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 1 + + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 3 + + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 3 + + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-verdin-wifi.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 411 +++--- + .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 90 ++ + arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts | 114 ++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 54 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 45 + + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 896 +++++++++++++ + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 129 ++ + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 46 + + .../dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts | 18 + + .../dts/freescale/imx8mp-verdin-nonwifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi | 54 + + .../dts/freescale/imx8mp-verdin-wifi-dahlia.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-wifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 82 ++ + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 1380 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 121 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 25 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 + + drivers/soc/imx/gpcv2.c | 430 +++++- + 117 files changed, 8664 insertions(+), 1548 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-aster.dts + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris.dts + delete mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts + delete mode 100644 arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-vicut1-12inch.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi + create mode 100644 arch/arm/boot/dts/ls1021a-iot.dts + create mode 100644 arch/arm/boot/dts/mba6ulx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (54715794cbcd Merge branch 'v5.18-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 5 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 32 + + .../bindings/arm/mediatek/mediatek,pericfg.yaml | 1 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 10 +- + arch/arm/boot/dts/en7523.dtsi | 8 + + arch/arm/boot/dts/mt2701.dtsi | 2 - + arch/arm/boot/dts/mt7623n.dtsi | 5 - + arch/arm/mach-mediatek/Kconfig | 1 + + arch/arm64/boot/dts/mediatek/Makefile | 2 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 298 ++++++ + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 29 +- + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 17 +- + arch/arm64/boot/dts/mediatek/mt8192-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 526 +++++++++- + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 445 +++++++++ + arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 181 ++++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1045 ++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 1 - + arch/arm64/configs/defconfig | 4 + + drivers/soc/mediatek/mt8167-mmsys.h | 2 +- + drivers/soc/mediatek/mt8183-mmsys.h | 2 +- + drivers/soc/mediatek/mt8186-mmsys.h | 4 +- + drivers/soc/mediatek/mt8192-mmsys.h | 4 +- + drivers/soc/mediatek/mt8195-mmsys.h | 370 +++++++ + drivers/soc/mediatek/mt8365-mmsys.h | 4 +- + drivers/soc/mediatek/mtk-cmdq-helper.c | 25 +- + drivers/soc/mediatek/mtk-mmsys.c | 153 ++- + drivers/soc/mediatek/mtk-mmsys.h | 6 + + drivers/soc/mediatek/mtk-mutex.c | 92 +- + include/dt-bindings/reset/mt8192-resets.h | 3 + + include/linux/soc/mediatek/mtk-cmdq.h | 5 +- + include/linux/soc/mediatek/mtk-mmsys.h | 12 + + 36 files changed, 3194 insertions(+), 117 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6359.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-demo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8195.dtsi + create mode 100644 drivers/soc/mediatek/mt8195-mmsys.h +Merging mvebu/for-next (8885ae5142a4 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Merge made by the 'ort' strategy. +Merging omap/for-next (930161749e64 Merge branch 'omap-for-v5.19/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/omap/prcm.txt | 7 +- + .../devicetree/bindings/clock/ti-clkctrl.txt | 4 +- + .../devicetree/bindings/clock/ti/clockdomain.txt | 3 + + .../devicetree/bindings/clock/ti/composite.txt | 3 + + .../bindings/clock/ti/fixed-factor-clock.txt | 1 + + .../devicetree/bindings/clock/ti/gate.txt | 1 + + .../devicetree/bindings/clock/ti/interface.txt | 1 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 1 + + MAINTAINERS | 1 - + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-guardian.dts | 376 +++++++++-- + arch/arm/boot/dts/am335x-myirtech-myc.dtsi | 12 +- + arch/arm/boot/dts/am335x-myirtech-myd.dts | 20 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 373 +++++++---- + arch/arm/boot/dts/am43xx-clocks.dtsi | 339 ++++++---- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 693 ++++++++++++++------- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 10 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +- + arch/arm/boot/dts/omap443x-clocks.dtsi | 1 + + arch/arm/boot/dts/omap446x-clocks.dtsi | 2 + + arch/arm/boot/dts/omap44xx-clocks.dtsi | 173 ++++- + arch/arm/boot/dts/omap5-igep0050.dts | 2 +- + arch/arm/boot/dts/omap5-uevm.dts | 2 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 160 ++++- + arch/arm/mach-omap2/cm_common.c | 8 +- + arch/arm/mach-omap2/control.c | 19 +- + arch/arm/mach-omap2/omap_device.c | 20 - + arch/arm/mach-omap2/omap_device.h | 1 - + arch/arm/mach-omap2/prm_common.c | 8 +- + drivers/bus/ti-sysc.c | 4 +- + 31 files changed, 1651 insertions(+), 600 deletions(-) +Merging qcom/for-next (0b3dd1e94ac0 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/qcom-ipq8064.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 21 + + .../bindings/bus/qcom,ssc-block-bus.yaml | 147 + + .../devicetree/bindings/clock/qcom,rpmcc.txt | 63 - + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 75 + + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 172 + + .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- + .../bindings/interconnect/qcom,bcm-voter.yaml | 8 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 3 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 +- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 2 +- + .../bindings/remoteproc/qcom,wcnss-pil.txt | 2 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 99 +- + .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 87 - + .../devicetree/bindings/soc/qcom/qcom,gsbi.yaml | 132 + + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 272 ++ + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 11 +- + .../devicetree/bindings/soc/qcom/qcom,smd.txt | 98 - + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 137 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 110 - + .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 145 + + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 - + .../devicetree/bindings/soc/qcom/qcom,smsm.yaml | 138 + + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 131 - + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 137 + + .../devicetree/bindings/soc/qcom/rpmh-rsc.txt | 137 - + .../devicetree/bindings/spi/qcom,spi-geni-qcom.txt | 39 - + .../bindings/spi/qcom,spi-geni-qcom.yaml | 116 + + arch/arm/boot/dts/Makefile | 13 +- + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 294 ++ + ...dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} | 0 + arch/arm/boot/dts/qcom-apq8064.dtsi | 16 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 582 ++- + arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 42 +- + arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 9 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 409 --- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 1052 +++--- + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 908 ----- + .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 435 --- + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 723 ---- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 484 --- + .../dts/qcom-msm8974-sony-xperia-rhine-amami.dts | 13 + + .../dts/qcom-msm8974-sony-xperia-rhine-honami.dts | 7 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 457 +++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 1916 +++++----- + .../arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 396 +++ + arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 813 +++++ + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 608 ++++ + arch/arm/boot/dts/qcom-msm8974pro.dtsi | 32 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 41 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 2 +- + arch/arm/boot/dts/qcom-pmx65.dtsi | 32 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +- + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 221 ++ + arch/arm/boot/dts/qcom-sdx65.dtsi | 193 +- + arch/arm/configs/qcom_defconfig | 8 + + arch/arm64/boot/dts/qcom/Makefile | 5 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 + + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 34 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 2 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 42 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 59 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 102 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 52 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 36 +- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 24 +- + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 21 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 89 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 126 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 8 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 18 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 36 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 9 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 9 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 250 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 31 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 15 + + arch/arm64/boot/dts/qcom/pm8350.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 +- + arch/arm64/boot/dts/qcom/pm8450.dtsi | 59 + + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 31 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 94 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 229 ++ + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 4 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 - + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- + .../dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} | 7 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 325 ++ + .../dts/qcom/sc7280-herobrine-herobrine-r0.dts | 1352 ------- + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 30 + + .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 296 ++ + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 69 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 18 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 336 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 33 + + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 35 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 34 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 241 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 61 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 330 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 12 + + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 343 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 4 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 186 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 41 + + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 34 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 3750 ++++++++++++++++---- + arch/arm64/configs/defconfig | 16 + + drivers/bus/Kconfig | 11 + + drivers/bus/Makefile | 1 + + drivers/bus/qcom-ssc-block-bus.c | 389 ++ + drivers/clk/qcom/Kconfig | 10 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-regmap-mux.c | 78 + + drivers/clk/qcom/clk-regmap-mux.h | 3 + + drivers/clk/qcom/clk-smd-rpm.c | 8 +- + drivers/clk/qcom/gcc-msm8998.c | 56 + + drivers/clk/qcom/gcc-sc7280.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 6 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 838 +++++ + drivers/clk/qcom/lpasscorecc-sc7280.c | 431 +++ + drivers/firmware/qcom_scm.c | 4 + + drivers/soc/qcom/llcc-qcom.c | 1 + + drivers/soc/qcom/pdr_interface.c | 11 +- + drivers/soc/qcom/rpmhpd.c | 73 +- + drivers/soc/qcom/smem.c | 305 +- + drivers/soc/qcom/smp2p.c | 1 + + drivers/soc/qcom/smsm.c | 1 + + drivers/soc/qcom/socinfo.c | 26 +- + include/dt-bindings/clock/qcom,gcc-msm8998.h | 4 + + .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 43 + + .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 26 + + include/dt-bindings/power/qcom-rpmpd.h | 26 + + 154 files changed, 15422 insertions(+), 8203 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/qcom,ssc-block-bus.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt + delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt + create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml + create mode 100644 arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts + rename arch/arm/boot/dts/{qcom-apq8064-sony-xperia-yuga.dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} (100%) + delete mode 100644 arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts + delete mode 100644 arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts + delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts + delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts + delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts + create mode 100644 arch/arm/boot/dts/qcom-pmx65.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8450.dtsi + rename arch/arm64/boot/dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} (88%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts + create mode 100644 drivers/bus/qcom-ssc-block-bus.c + create mode 100644 drivers/clk/qcom/lpassaudiocc-sc7280.c + create mode 100644 drivers/clk/qcom/lpasscorecc-sc7280.c + create mode 100644 include/dt-bindings/clock/qcom,lpassaudiocc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,lpasscorecc-sc7280.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (f8a7df6a1a04 Merge branch 'renesas-arm-dt-for-v5.19' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 20 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 5 +- + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + arch/arm/boot/dts/r8a7743.dtsi | 1 + + arch/arm/boot/dts/r8a7744.dtsi | 1 + + arch/arm/boot/dts/r8a7745.dtsi | 1 + + arch/arm/boot/dts/r8a77470.dtsi | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 1 + + arch/arm/boot/dts/r8a7791.dtsi | 1 + + arch/arm/boot/dts/r8a7792.dtsi | 1 + + arch/arm/boot/dts/r8a7793.dtsi | 1 + + arch/arm/boot/dts/r8a7794.dtsi | 1 + + arch/arm/boot/dts/r9a06g032.dtsi | 4 +- + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm64/boot/dts/renesas/Makefile | 4 + + arch/arm64/boot/dts/renesas/draak.dtsi | 58 ++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 58 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 42 ++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 17 + + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 24 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 57 ++ + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 20 + + .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 15 + + arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 10 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 163 +++++ + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 45 ++ + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 22 + + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 122 ++++ + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 767 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 21 + + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 76 -- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 584 +++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 8 - + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 24 - + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 30 + + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 64 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 61 ++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 38 + + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 119 ++++ + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 251 +++++++ + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 63 ++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 49 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 49 ++ + arch/arm64/configs/defconfig | 5 + + drivers/soc/renesas/Kconfig | 26 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a779g0-sysc.c | 62 ++ + drivers/soc/renesas/rcar-gen4-sysc.c | 3 + + drivers/soc/renesas/rcar-gen4-sysc.h | 1 + + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/renesas-soc.c | 21 + + include/dt-bindings/clock/r8a779g0-cpg-mssr.h | 90 +++ + include/dt-bindings/clock/r9a07g043-cpg.h | 184 +++++ + include/dt-bindings/power/r8a779g0-sysc.h | 45 ++ + 65 files changed, 3276 insertions(+), 153 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0-spider-ethernet.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi + create mode 100644 drivers/soc/renesas/r8a779g0-sysc.c + create mode 100644 include/dt-bindings/clock/r8a779g0-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r9a07g043-cpg.h + create mode 100644 include/dt-bindings/power/r8a779g0-sysc.h +Merging reset/reset/next (25459cf32255 dt-bindings: reset: st,sti-powerdown: Convert to yaml) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/reset/altr,rst-mgr.yaml | 47 ++++++++ + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 22 ---- + .../reset/amlogic,meson-axg-audio-arb.yaml | 56 +++++++++ + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../devicetree/bindings/reset/ath79-reset.txt | 20 ---- + .../devicetree/bindings/reset/berlin,reset.txt | 23 ---- + .../bindings/reset/bitmain,bm1880-reset.txt | 18 --- + .../bindings/reset/bitmain,bm1880-reset.yaml | 36 ++++++ + .../devicetree/bindings/reset/lantiq,reset.txt | 30 ----- + .../devicetree/bindings/reset/lantiq,reset.yaml | 49 ++++++++ + .../bindings/reset/marvell,berlin2-reset.yaml | 38 +++++++ + .../bindings/reset/nuvoton,npcm-reset.txt | 32 ------ + .../bindings/reset/nuvoton,npcm750-reset.yaml | 50 +++++++++ + .../bindings/reset/qca,ar7100-reset.yaml | 40 +++++++ + .../bindings/reset/snps,axs10x-reset.txt | 33 ------ + .../bindings/reset/snps,axs10x-reset.yaml | 48 ++++++++ + .../devicetree/bindings/reset/socfpga-reset.txt | 16 --- + .../reset/socionext,uniphier-glue-reset.yaml | 52 ++++++--- + .../bindings/reset/st,sti-picophyreset.txt | 42 ------- + .../devicetree/bindings/reset/st,sti-powerdown.txt | 45 -------- + .../bindings/reset/st,stih407-picophyreset.yaml | 47 ++++++++ + .../bindings/reset/st,stih407-powerdown.yaml | 49 ++++++++ + drivers/reset/Kconfig | 2 +- + drivers/reset/core.c | 15 ++- + drivers/reset/reset-meson.c | 6 + + drivers/reset/reset-simple.c | 1 + + drivers/reset/reset-uniphier-glue.c | 75 ++++++------- + include/dt-bindings/reset/amlogic,meson-s4-reset.h | 125 +++++++++++++++++++++ + 28 files changed, 680 insertions(+), 338 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/altr,rst-mgr.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/ath79-reset.txt + delete mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt + delete mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/lantiq,reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/lantiq,reset.yaml + create mode 100644 Documentation/devicetree/bindings/reset/marvell,berlin2-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm750-reset.yaml + create mode 100644 Documentation/devicetree/bindings/reset/qca,ar7100-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/socfpga-reset.txt + delete mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt + delete mode 100644 Documentation/devicetree/bindings/reset/st,sti-powerdown.txt + create mode 100644 Documentation/devicetree/bindings/reset/st,stih407-picophyreset.yaml + create mode 100644 Documentation/devicetree/bindings/reset/st,stih407-powerdown.yaml + create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h +Merging rockchip/for-next (7aa1e0349129 Merge branch 'v5.19-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 23 +- + .../bindings/clock/rockchip,rk3399-cru.yaml | 33 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 3 + + arch/arm/boot/dts/rk3036.dtsi | 4 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 +- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 6 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 22 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 7 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 12 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 28 + + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 25 + + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 43 +- + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 80 +++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 37 ++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 615 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 579 +++++++++++++++++++ + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 177 ++++++ + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 616 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 + + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 142 ++++- + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 46 ++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 562 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 23 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 74 ++- + drivers/soc/Makefile | 2 +- + drivers/soc/rockchip/Kconfig | 24 +- + drivers/soc/rockchip/grf.c | 17 + + drivers/soc/rockchip/pm_domains.c | 10 +- + 39 files changed, 3186 insertions(+), 66 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Merging samsung-krzk/for-next (96a93983e538 Merge branch 'for-v5.19/arm-dts64-cleanups' 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/arm/configs/mini2440_defconfig +Auto-merging arch/arm/configs/s3c2410_defconfig +Auto-merging arch/arm/mach-s3c/Kconfig.s3c24xx +Auto-merging arch/arm/mach-s3c/pm-s3c64xx.c +Merge made by the 'ort' strategy. + .../bindings/soc/samsung/exynos-usi.yaml | 2 +- + .../bindings/timer/samsung,exynos4210-mct.yaml | 67 +++++++++++++++++++++- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/am335x-sl50.dts | 2 +- + arch/arm/boot/dts/am3874-iceboard.dts | 2 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am574x-idk.dts | 2 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 2 +- + arch/arm/boot/dts/armada-370-db.dts | 2 +- + .../dts/armada-370-seagate-personal-cloud.dtsi | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +- + arch/arm/boot/dts/armada-375-db.dts | 2 +- + arch/arm/boot/dts/armada-381-netgear-gs110emx.dts | 2 +- + arch/arm/boot/dts/armada-385-atl-x530.dts | 2 +- + arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi | 2 +- + arch/arm/boot/dts/armada-385-db-88f6820-amc.dts | 2 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 2 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 +- + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 2 +- + arch/arm/boot/dts/armada-388-rd.dts | 2 +- + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 2 +- + arch/arm/boot/dts/armada-390-db.dts | 2 +- + arch/arm/boot/dts/armada-398-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +- + arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 2 +- + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 2 +- + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 2 +- + .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 2 +- + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 2 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 2 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove-d2plug.dts | 2 +- + arch/arm/boot/dts/dove-d3plug.dts | 2 +- + arch/arm/boot/dts/dove-dove-db.dts | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra76-evm.dts | 2 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 2 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +- + arch/arm/boot/dts/nuvoton-npcm730-gbs.dts | 6 +- + arch/arm/boot/dts/nuvoton-npcm730-gsj.dts | 2 +- + arch/arm/boot/dts/nuvoton-npcm730-kudo.dts | 6 +- + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 8 +-- + .../boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 6 +- + arch/arm/configs/mini2440_defconfig | 3 +- + arch/arm/configs/s3c2410_defconfig | 2 + + arch/arm/mach-s3c/Kconfig | 8 --- + arch/arm/mach-s3c/Kconfig.s3c24xx | 2 - + arch/arm/mach-s3c/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c/pm-s3c64xx.c | 2 +- + arch/arm/mach-s3c/s3c24xx.c | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 4 +- + .../boot/dts/marvell/armada-7040-mochabin.dts | 2 +- + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 4 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 +- + .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 2 +- + arch/arm64/boot/dts/microchip/sparx5_nand.dtsi | 2 +- + arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 4 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 4 +- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 4 +- + 83 files changed, 162 insertions(+), 108 deletions(-) +Merging scmi/for-linux-next (d291310bcf58 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,corstone1000.yaml | 45 ++ + arch/arm64/boot/dts/arm/Makefile | 1 + + arch/arm64/boot/dts/arm/corstone1000-fvp.dts | 51 ++ + arch/arm64/boot/dts/arm/corstone1000-mps3.dts | 32 + + arch/arm64/boot/dts/arm/corstone1000.dtsi | 164 ++++++ + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 3 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 164 +++++- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 37 +- + arch/arm64/boot/dts/arm/juno-r1-scmi.dts | 8 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 25 + + arch/arm64/boot/dts/arm/juno-r2-scmi.dts | 8 +- + arch/arm64/boot/dts/arm/juno-r2.dts | 25 + + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 25 + + arch/arm64/boot/dts/arm/juno.dts | 25 + + .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 11 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 4 +- + drivers/firmware/arm_ffa/driver.c | 24 +- + drivers/firmware/arm_scmi/Kconfig | 1 + + drivers/firmware/arm_scmi/base.c | 46 +- + drivers/firmware/arm_scmi/clock.c | 343 ++++++++--- + drivers/firmware/arm_scmi/common.h | 225 +------ + drivers/firmware/arm_scmi/driver.c | 165 +++++- + drivers/firmware/arm_scmi/optee.c | 144 +++-- + drivers/firmware/arm_scmi/perf.c | 162 ++++-- + drivers/firmware/arm_scmi/power.c | 44 +- + drivers/firmware/arm_scmi/protocols.h | 318 ++++++++++ + drivers/firmware/arm_scmi/reset.c | 40 +- + drivers/firmware/arm_scmi/sensors.c | 645 ++++++++++++--------- + drivers/firmware/arm_scmi/system.c | 9 +- + drivers/firmware/arm_scmi/voltage.c | 218 ++++--- + drivers/tee/optee/ffa_abi.c | 2 +- + include/linux/arm_ffa.h | 7 +- + include/linux/scmi_protocol.h | 31 +- + 34 files changed, 2244 insertions(+), 810 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,corstone1000.yaml + create mode 100644 arch/arm64/boot/dts/arm/corstone1000-fvp.dts + create mode 100644 arch/arm64/boot/dts/arm/corstone1000-mps3.dts + create mode 100644 arch/arm64/boot/dts/arm/corstone1000.dtsi + create mode 100644 drivers/firmware/arm_scmi/protocols.h +Merging stm32/stm32-next (1a43e9b281c6 ARM: dts: stm32: add support for Protonic PRTT1x boards) +$ 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 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 48 ++-- + .../bindings/staging/net/wireless/silabs,wfx.yaml | 1 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stm32h743.dtsi | 2 +- + arch/arm/boot/dts/stm32mp131.dtsi | 17 +- + arch/arm/boot/dts/stm32mp135f-dk.dts | 4 + + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 64 +++++ + arch/arm/boot/dts/stm32mp151.dtsi | 4 +- + arch/arm/boot/dts/stm32mp151a-prtt1a.dts | 52 ++++ + arch/arm/boot/dts/stm32mp151a-prtt1c.dts | 304 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 229 ++++++++++++++++ + arch/arm/boot/dts/stm32mp151a-prtt1s.dts | 63 +++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 1 + + 16 files changed, 792 insertions(+), 26 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1a.dts + create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1c.dts + create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1s.dts +Merging sunxi/sunxi/for-next (737a9ba0eeb8 Merge branch 'sunxi/fixes-for-5.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 24 ++--- + arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 31 ++++++ + arch/arm/boot/dts/suniv-f1c100s.dtsi | 104 +++++++++++++++++++-- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 30 ++++++ + 6 files changed, 170 insertions(+), 25 deletions(-) +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/Kconfig | 5 +-- + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_core.c | 2 -- + drivers/tee/tee_shm.c | 85 ++++++++++++++---------------------------------- + include/linux/tee_drv.h | 18 ---------- + include/uapi/linux/tee.h | 4 --- + 6 files changed, 27 insertions(+), 89 deletions(-) +Merging tegra/for-next (59ac218540e9 Merge branch for-5.19/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/memory/tegra/mc.c +Merge made by the 'ort' strategy. + .../memory-controllers/nvidia,tegra186-mc.yaml | 80 +++++++- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 223 ++++++++++++++++++++ + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 15 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 225 ++++++++++++++++++++- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 225 ++++++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 42 +++- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 12 ++ + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 223 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 67 +++++- + arch/arm64/configs/defconfig | 1 + + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 143 +++++++++++-- + drivers/memory/tegra/mc.h | 50 ++++- + drivers/memory/tegra/tegra186-emc.c | 3 + + drivers/memory/tegra/tegra186.c | 43 ++++ + drivers/memory/tegra/tegra194.c | 9 + + drivers/memory/tegra/tegra234.c | 110 ++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 8 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 17 +- + drivers/soc/tegra/pmc.c | 33 ++- + include/dt-bindings/clock/tegra234-clock.h | 8 + + include/dt-bindings/reset/tegra234-reset.h | 2 + + include/soc/tegra/mc.h | 9 +- + 26 files changed, 1506 insertions(+), 50 deletions(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (720b32f0f7bc Merge branch 'ti-k3-config-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 +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/reset/Kconfig +Merge made by the 'ort' strategy. + arch/arm/boot/dts/keystone-k2e-evm.dts | 4 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2g-ice.dts | 2 +- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 4 +- + arch/arm/boot/dts/keystone-k2l-evm.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 307 +++++++++++++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 48 +++++ + arch/arm64/boot/dts/ti/k3-am62.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 289 +++++++++++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 62 +++++++ + arch/arm64/configs/defconfig | 3 + + drivers/reset/Kconfig | 2 +- + drivers/soc/ti/knav_dma.c | 29 ++- + drivers/soc/ti/knav_qmss_queue.c | 19 +- + drivers/soc/ti/omap_prm.c | 7 +- + drivers/soc/ti/pruss.c | 3 +- + drivers/soc/ti/ti_sci_pm_domains.c | 2 + + drivers/soc/ti/wkup_m3_ipc.c | 30 ++- + include/linux/wkup_m3_ipc.h | 1 + + 20 files changed, 771 insertions(+), 50 deletions(-) +Merging xilinx/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (b473708bf4b5 Merge branch 'clk-airoha' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging drivers/clk/Makefile +Merge made by the 'ort' strategy. + .../arm/mediatek/mediatek,mt8186-clock.yaml | 56 ++ + .../arm/mediatek/mediatek,mt8186-sys-clock.yaml | 54 ++ + .../bindings/clock/airoha,en7523-scu.yaml | 58 ++ + .../bindings/clock/renesas,rzg2l-cpg.yaml | 7 +- + .../bindings/clock/stericsson,u8500-clks.yaml | 57 ++ + .../bindings/clock/ti,am654-ehrpwm-tbclk.yaml | 1 + + drivers/clk/Kconfig | 9 + + drivers/clk/Makefile | 1 + + drivers/clk/actions/owl-pll.c | 2 +- + drivers/clk/clk-cdce706.c | 5 +- + drivers/clk/clk-cdce925.c | 24 +- + drivers/clk/clk-cs2000-cp.c | 5 +- + drivers/clk/clk-en7523.c | 351 ++++++++++ + drivers/clk/clk-max9485.c | 5 +- + drivers/clk/clk-mux.c | 4 +- + drivers/clk/clk-renesas-pcie.c | 4 +- + drivers/clk/clk-si514.c | 5 +- + drivers/clk/clk-si5341.c | 5 +- + drivers/clk/clk-si5351.c | 24 +- + drivers/clk/clk-si544.c | 22 +- + drivers/clk/clk-si570.c | 24 +- + drivers/clk/clk.c | 9 +- + drivers/clk/keystone/syscon-clk.c | 11 + + drivers/clk/mediatek/Kconfig | 8 + + drivers/clk/mediatek/Makefile | 5 + + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 133 ++++ + drivers/clk/mediatek/clk-mt8186-cam.c | 90 +++ + drivers/clk/mediatek/clk-mt8186-img.c | 68 ++ + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 67 ++ + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 216 ++++++ + drivers/clk/mediatek/clk-mt8186-ipe.c | 55 ++ + drivers/clk/mediatek/clk-mt8186-mcu.c | 108 +++ + drivers/clk/mediatek/clk-mt8186-mdp.c | 80 +++ + drivers/clk/mediatek/clk-mt8186-mfg.c | 48 ++ + drivers/clk/mediatek/clk-mt8186-mm.c | 111 +++ + drivers/clk/mediatek/clk-mt8186-topckgen.c | 780 +++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8186-vdec.c | 88 +++ + drivers/clk/mediatek/clk-mt8186-venc.c | 51 ++ + drivers/clk/mediatek/clk-mt8186-wpe.c | 51 ++ + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 8 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 10 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 7 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 11 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 11 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 9 +- + drivers/clk/renesas/r9a07g043-cpg.c | 220 ++++++ + drivers/clk/renesas/rcar-gen3-cpg.h | 5 +- + drivers/clk/renesas/rzg2l-cpg.c | 10 +- + drivers/clk/renesas/rzg2l-cpg.h | 1 + + drivers/clk/ux500/clk-prcmu.c | 252 ++++--- + drivers/clk/ux500/clk.h | 70 +- + drivers/clk/ux500/u8500_of_clk.c | 350 +++++---- + include/dt-bindings/clock/en7523-clk.h | 17 + + include/dt-bindings/clock/mt8186-clk.h | 445 ++++++++++++ + include/dt-bindings/clock/ste-db8500-clkout.h | 17 + + 63 files changed, 3792 insertions(+), 415 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml + create mode 100644 drivers/clk/clk-en7523.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-mcu.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-mdp.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8186-wpe.c + create mode 100644 drivers/clk/renesas/r9a07g043-cpg.c + create mode 100644 include/dt-bindings/clock/en7523-clk.h + create mode 100644 include/dt-bindings/clock/mt8186-clk.h + create mode 100644 include/dt-bindings/clock/ste-db8500-clkout.h +Merging clk-imx/for-next (43896f56b59e clk: imx8mp: add clkout1/2 support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-composite-8m.c | 19 ++++++++------- + drivers/clk/imx/clk-imx7d.c | 1 - + drivers/clk/imx/clk-imx8mm.c | 3 ++- + drivers/clk/imx/clk-imx8mn.c | 41 +++++++++++++++++++++++++++++++- + drivers/clk/imx/clk-imx8mp.c | 22 ++++++++++++++--- + drivers/clk/imx/clk-imx8mq.c | 5 ++-- + drivers/clk/imx/clk-scu.c | 6 +++-- + drivers/clk/imx/clk.c | 5 ++++ + drivers/clk/imx/clk.h | 1 + + include/dt-bindings/clock/imx8mn-clock.h | 16 ++++++++++++- + include/dt-bindings/clock/imx8mp-clock.h | 9 ++++++- + 11 files changed, 108 insertions(+), 20 deletions(-) +Merging clk-renesas/renesas-clk (0ab55cf18341 clk: renesas: cpg-mssr: Add support for R-Car V4H) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + drivers/clk/renesas/Kconfig | 5 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 21 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 218 +++++++++++++++++++++ + drivers/clk/renesas/r9a06g032-clocks.c | 2 +- + drivers/clk/renesas/r9a07g043-cpg.c | 68 +++++++ + drivers/clk/renesas/rcar-gen4-cpg.c | 5 + + drivers/clk/renesas/rcar-gen4-cpg.h | 3 + + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + 12 files changed, 326 insertions(+), 17 deletions(-) + create mode 100644 drivers/clk/renesas/r8a779g0-cpg-mssr.c +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (c5acdf12cc24 csky: atomic: Add conditional atomic operations' optimization) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/Kconfig | 8 + + arch/csky/abiv1/Makefile | 2 - + arch/csky/abiv1/memcpy.S | 347 -------------------------------------- + arch/csky/abiv1/strksyms.c | 6 - + arch/csky/abiv2/Makefile | 2 + + arch/csky/abiv2/strksyms.c | 4 +- + arch/csky/include/asm/atomic.h | 237 ++++++++++++++++++++++++++ + arch/csky/include/asm/barrier.h | 11 +- + arch/csky/include/asm/cmpxchg.h | 64 ++++++- + arch/csky/include/asm/io.h | 12 +- + arch/csky/kernel/Makefile | 2 +- + arch/csky/kernel/io.c | 91 ++++++++++ + arch/csky/kernel/module.c | 2 +- + arch/csky/kernel/probes/kprobes.c | 2 +- + arch/csky/kernel/probes/uprobes.c | 2 +- + arch/csky/kernel/process.c | 1 - + arch/csky/lib/Makefile | 3 + + arch/csky/lib/string.c | 134 +++++++++++++++ + arch/csky/mm/dma-mapping.c | 1 - + 19 files changed, 560 insertions(+), 371 deletions(-) + delete mode 100644 arch/csky/abiv1/memcpy.S + delete mode 100644 arch/csky/abiv1/strksyms.c + create mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/kernel/io.c + create mode 100644 arch/csky/lib/string.c +Merging m68k/for-next (a96e4ebf3ded m68k: defconfig: Update defconfigs for v5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Merge made by the 'ort' strategy. + arch/m68k/Kbuild | 1 + + arch/m68k/Kconfig.machine | 17 ++++ + arch/m68k/configs/amiga_defconfig | 5 +- + arch/m68k/configs/apollo_defconfig | 5 +- + arch/m68k/configs/atari_defconfig | 5 +- + arch/m68k/configs/bvme6000_defconfig | 5 +- + arch/m68k/configs/hp300_defconfig | 5 +- + arch/m68k/configs/mac_defconfig | 5 +- + arch/m68k/configs/multi_defconfig | 5 +- + arch/m68k/configs/mvme147_defconfig | 5 +- + arch/m68k/configs/mvme16x_defconfig | 5 +- + arch/m68k/configs/q40_defconfig | 5 +- + arch/m68k/configs/sun3_defconfig | 5 +- + arch/m68k/configs/sun3x_defconfig | 5 +- + arch/m68k/configs/virt_defconfig | 68 +++++++++++++ + arch/m68k/include/asm/config.h | 2 + + arch/m68k/include/asm/io.h | 3 + + arch/m68k/include/asm/irq.h | 3 +- + arch/m68k/include/asm/pgtable_mm.h | 7 ++ + arch/m68k/include/asm/setup.h | 44 ++++++-- + arch/m68k/include/asm/virt.h | 25 +++++ + arch/m68k/include/uapi/asm/bootinfo-virt.h | 18 ++++ + arch/m68k/include/uapi/asm/bootinfo.h | 1 + + arch/m68k/kernel/Makefile | 1 + + arch/m68k/kernel/head.S | 31 ++++++ + arch/m68k/kernel/setup_mm.c | 7 ++ + arch/m68k/mm/kmap.c | 21 ++-- + arch/m68k/virt/Makefile | 6 ++ + arch/m68k/virt/config.c | 130 ++++++++++++++++++++++++ + arch/m68k/virt/ints.c | 155 +++++++++++++++++++++++++++++ + arch/m68k/virt/platform.c | 72 ++++++++++++++ + drivers/clocksource/Kconfig | 7 ++ + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-goldfish.c | 153 ++++++++++++++++++++++++++++ + drivers/rtc/rtc-goldfish.c | 44 ++++---- + drivers/tty/goldfish.c | 20 ++-- + include/clocksource/timer-goldfish.h | 31 ++++++ + include/linux/goldfish.h | 15 ++- + 38 files changed, 837 insertions(+), 106 deletions(-) + create mode 100644 arch/m68k/configs/virt_defconfig + create mode 100644 arch/m68k/include/asm/virt.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-virt.h + create mode 100644 arch/m68k/virt/Makefile + create mode 100644 arch/m68k/virt/config.c + create mode 100644 arch/m68k/virt/ints.c + create mode 100644 arch/m68k/virt/platform.c + create mode 100644 drivers/clocksource/timer-goldfish.c + create mode 100644 include/clocksource/timer-goldfish.h +Merging m68knommu/for-next (2954225f1484 m68k: coldfire: drop ISA_DMA_API support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/Kconfig.bus | 10 - + arch/m68k/coldfire/Makefile | 2 +- + arch/m68k/coldfire/dma.c | 43 ---- + arch/m68k/include/asm/dma.h | 483 ------------------------------------- + arch/m68k/include/asm/pgtable_no.h | 3 +- + arch/m68k/mm/motorola.c | 1 - + drivers/mmc/host/Kconfig | 2 +- + sound/core/Makefile | 2 - + sound/isa/Kconfig | 2 +- + 9 files changed, 5 insertions(+), 543 deletions(-) + delete mode 100644 arch/m68k/coldfire/dma.c +Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/include/asm/string.h | 2 ++ + arch/microblaze/kernel/kgdb.c | 2 +- + arch/microblaze/lib/memcpy.c | 18 ++---------------- + arch/microblaze/lib/memmove.c | 31 +++---------------------------- + arch/microblaze/lib/memset.c | 33 ++++++++++++++------------------- + arch/microblaze/mm/init.c | 5 +++++ + 6 files changed, 27 insertions(+), 64 deletions(-) +Merging mips/mips-next (7671f9674b47 mips: dts: ingenic: x1000: Add PWM device tree node) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 2 +- + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 2 +- + arch/mips/boot/dts/ingenic/x1000.dtsi | 12 +++++++++ + arch/mips/boot/dts/mscc/jaguar2_pcb110.dts | 10 ++++---- + arch/mips/boot/dts/mscc/jaguar2_pcb111.dts | 10 ++++---- + arch/mips/boot/dts/mscc/jaguar2_pcb118.dts | 6 ++--- + arch/mips/boot/dts/mscc/ocelot.dtsi | 4 +-- + arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 6 ++--- + arch/mips/boot/dts/mscc/serval_common.dtsi | 14 +++++----- + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 26 ++++++------------- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 30 ++++++---------------- + arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 5 ++-- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 +++++ + arch/mips/kernel/mips-cpc.c | 1 + + arch/mips/sgi-ip27/ip27-xtalk.c | 4 +++ + arch/mips/sgi-ip30/ip30-xtalk.c | 4 +++ + 19 files changed, 76 insertions(+), 72 deletions(-) +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e34799ccc126 parisc: Change MAX_ADDRESS to become unsigned long long) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-32bit_defconfig | 4 +++- + arch/parisc/configs/generic-64bit_defconfig | 3 ++- + arch/parisc/include/asm/cache.h | 1 + + arch/parisc/include/asm/cacheflush.h | 5 +++-- + arch/parisc/include/asm/pgtable.h | 2 +- + arch/parisc/kernel/cache.c | 17 ++++++++++++++++- + arch/parisc/kernel/pacache.S | 3 --- + arch/parisc/kernel/processor.c | 11 +++++++++-- + drivers/video/console/sticore.c | 21 +++++++++++++++++++++ + 10 files changed, 57 insertions(+), 11 deletions(-) +Merging powerpc/next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging risc-v/for-next (d26eee72d9b9 riscv: dts: rename the node name of dma) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 +++-- + arch/riscv/mm/fault.c | 10 +++------- + 2 files changed, 6 insertions(+), 9 deletions(-) +Merging s390/for-next (aed80953c8f6 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 +Merge made by the 'ort' strategy. + arch/s390/include/asm/barrier.h | 16 +- + arch/s390/include/asm/ipl.h | 6 + + arch/s390/include/asm/pci_debug.h | 7 +- + arch/s390/include/asm/processor.h | 8 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/scsw.h | 83 ++++++-- + arch/s390/include/asm/spinlock.h | 1 + + arch/s390/include/uapi/asm/pkey.h | 2 +- + arch/s390/include/uapi/asm/zcrypt.h | 42 ++-- + arch/s390/kernel/irq.c | 4 +- + arch/s390/kernel/machine_kexec.c | 10 +- + arch/s390/kernel/relocate_kernel.S | 3 +- + arch/s390/kernel/setup.c | 2 +- + arch/s390/kernel/vdso.c | 55 +++++- + arch/s390/mm/mmap.c | 4 +- + arch/s390/pci/pci.c | 2 +- + arch/s390/pci/pci_clp.c | 2 +- + arch/s390/pci/pci_debug.c | 2 +- + arch/s390/pci/pci_event.c | 3 - + arch/s390/pci/pci_insn.c | 108 ++++++++--- + drivers/s390/char/sclp_early.c | 4 +- + drivers/s390/crypto/ap_bus.c | 96 ++++++---- + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/ap_queue.c | 7 +- + drivers/s390/crypto/pkey_api.c | 149 ++++++++------- + drivers/s390/crypto/vfio_ap_drv.c | 2 - + drivers/s390/crypto/zcrypt_api.c | 215 ++++++++++----------- + drivers/s390/crypto/zcrypt_api.h | 4 +- + drivers/s390/crypto/zcrypt_card.c | 2 +- + drivers/s390/crypto/zcrypt_cca_key.h | 58 +++--- + drivers/s390/crypto/zcrypt_ccamisc.c | 272 +++++++++++++------------- + drivers/s390/crypto/zcrypt_ccamisc.h | 6 + + drivers/s390/crypto/zcrypt_cex2a.c | 11 +- + drivers/s390/crypto/zcrypt_cex2c.c | 10 +- + drivers/s390/crypto/zcrypt_cex4.c | 44 ++++- + drivers/s390/crypto/zcrypt_ep11misc.c | 168 ++++++++-------- + drivers/s390/crypto/zcrypt_ep11misc.h | 2 +- + drivers/s390/crypto/zcrypt_error.h | 3 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 31 +-- + drivers/s390/crypto/zcrypt_msgtype6.c | 340 ++++++++++++++------------------- + drivers/s390/crypto/zcrypt_msgtype6.h | 26 +-- + drivers/s390/crypto/zcrypt_queue.c | 2 +- + 42 files changed, 1019 insertions(+), 795 deletions(-) +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (7f9c97417481 xtensa: clean up labels in the kernel entry assembly) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging Documentation/features/debug/debug-vm-pgtable/arch-support.txt +Auto-merging Documentation/features/time/context-tracking/arch-support.txt +Auto-merging Documentation/features/time/virt-cpuacct/arch-support.txt +Merge made by the 'ort' strategy. + .../debug/debug-vm-pgtable/arch-support.txt | 2 +- + .../time/context-tracking/arch-support.txt | 2 +- + .../features/time/virt-cpuacct/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 18 ++ + arch/xtensa/boot/lib/Makefile | 1 + + arch/xtensa/include/asm/barrier.h | 12 +- + arch/xtensa/include/asm/bitops.h | 10 +- + arch/xtensa/include/asm/coprocessor.h | 11 +- + arch/xtensa/include/asm/processor.h | 7 + + arch/xtensa/include/asm/sections.h | 2 +- + arch/xtensa/include/asm/thread_info.h | 7 +- + arch/xtensa/include/asm/traps.h | 40 ++- + arch/xtensa/kernel/Makefile | 1 + + arch/xtensa/kernel/asm-offsets.c | 16 +- + arch/xtensa/kernel/coprocessor.S | 230 ++++++++------ + arch/xtensa/kernel/entry.S | 330 ++++++++++++++------- + arch/xtensa/kernel/hibernate.c | 25 ++ + arch/xtensa/kernel/process.c | 112 +++++-- + arch/xtensa/kernel/ptrace.c | 3 +- + arch/xtensa/kernel/s32c1i_selftest.c | 7 +- + arch/xtensa/kernel/signal.c | 3 +- + arch/xtensa/kernel/smp.c | 7 + + arch/xtensa/kernel/traps.c | 100 +++---- + arch/xtensa/lib/Makefile | 2 + + arch/xtensa/lib/kcsan-stubs.c | 54 ++++ + arch/xtensa/lib/memcopy.S | 20 +- + arch/xtensa/mm/Makefile | 3 +- + arch/xtensa/mm/fault.c | 112 +++---- + arch/xtensa/mm/mmu.c | 2 + + arch/xtensa/platforms/iss/network.c | 150 ++++------ + drivers/irqchip/irq-xtensa-mx.c | 18 +- + 31 files changed, 829 insertions(+), 480 deletions(-) + create mode 100644 arch/xtensa/kernel/hibernate.c + create mode 100644 arch/xtensa/lib/kcsan-stubs.c +Merging pidfd/for-next (0014edaedfd8 fs: unset MNT_WRITE_HOLD on failure) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/master (a7a5bc5fe8ac fscrypt: log when starting to use inline encryption) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Merge made by the 'ort' strategy. + fs/crypto/crypto.c | 10 +++++----- + fs/crypto/fname.c | 11 +++++++++-- + fs/crypto/fscrypt_private.h | 4 +++- + fs/crypto/inline_crypt.c | 33 ++++++++++++++++++++++++++++++++- + fs/crypto/keysetup.c | 2 +- + fs/ubifs/ubifs.h | 2 +- + include/linux/fscrypt.h | 12 +++++++++++- + 7 files changed, 62 insertions(+), 12 deletions(-) +Merging fscache/fscache-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (ee13d3e82868 Merge branch 'for-next-next-v5.18-20220429' into for-next-20220429) +$ 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/inode.c +Auto-merging fs/btrfs/ioctl.c +Merge made by the 'ort' strategy. + fs/btrfs/acl.c | 39 +- + fs/btrfs/async-thread.c | 122 +-- + fs/btrfs/async-thread.h | 7 +- + fs/btrfs/block-group.c | 205 +++-- + fs/btrfs/block-group.h | 7 +- + fs/btrfs/check-integrity.c | 172 ++-- + fs/btrfs/check-integrity.h | 6 +- + fs/btrfs/compression.c | 97 +- + fs/btrfs/compression.h | 11 +- + fs/btrfs/ctree.c | 100 ++- + fs/btrfs/ctree.h | 164 +++- + fs/btrfs/delalloc-space.c | 9 +- + fs/btrfs/delayed-inode.c | 84 +- + fs/btrfs/dev-replace.c | 52 +- + fs/btrfs/dir-item.c | 31 +- + fs/btrfs/disk-io.c | 451 ++++------ + fs/btrfs/disk-io.h | 18 +- + fs/btrfs/extent-tree.c | 38 +- + fs/btrfs/extent_io.c | 580 ++++++------ + fs/btrfs/extent_io.h | 23 +- + fs/btrfs/file.c | 280 +++--- + fs/btrfs/free-space-cache.c | 9 +- + fs/btrfs/free-space-tree.c | 2 +- + fs/btrfs/inode.c | 1879 +++++++++++++++++++------------------- + fs/btrfs/ioctl.c | 244 +++-- + fs/btrfs/props.c | 40 +- + fs/btrfs/props.h | 4 - + fs/btrfs/qgroup.c | 7 +- + fs/btrfs/qgroup.h | 12 +- + fs/btrfs/raid56.c | 916 ++++++++++--------- + fs/btrfs/raid56.h | 9 +- + fs/btrfs/reflink.c | 23 +- + fs/btrfs/relocation.c | 19 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 1889 ++++++++++++++++++++------------------- + fs/btrfs/send.c | 267 ++---- + fs/btrfs/space-info.c | 11 +- + fs/btrfs/space-info.h | 8 + + fs/btrfs/subpage.c | 55 +- + fs/btrfs/subpage.h | 2 + + fs/btrfs/super.c | 22 +- + fs/btrfs/sysfs.c | 43 +- + fs/btrfs/tests/btrfs-tests.c | 22 +- + fs/btrfs/transaction.c | 69 +- + fs/btrfs/tree-checker.c | 55 ++ + fs/btrfs/tree-checker.h | 1 + + fs/btrfs/tree-log.c | 11 +- + fs/btrfs/volumes.c | 299 +++---- + fs/btrfs/volumes.h | 50 +- + fs/btrfs/xattr.c | 40 +- + fs/btrfs/zoned.c | 190 ++-- + fs/btrfs/zoned.h | 17 +- + fs/btrfs/zstd.c | 14 +- + include/linux/fs.h | 5 + + include/trace/events/btrfs.h | 30 +- + include/uapi/linux/btrfs_tree.h | 13 - + 56 files changed, 4375 insertions(+), 4401 deletions(-) +Merging ceph/master (7acae6183cf3 ceph: fix possible NULL pointer dereference for req->r_session) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (672c0c517342 Linux 5.18-rc5) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (011c045788ed erofs: add 'fsid' mount option) +$ 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 'ort' strategy. + Documentation/filesystems/caching/cachefiles.rst | 178 ++++++++ + fs/cachefiles/Kconfig | 12 + + fs/cachefiles/Makefile | 1 + + fs/cachefiles/daemon.c | 117 +++++- + fs/cachefiles/interface.c | 2 + + fs/cachefiles/internal.h | 78 ++++ + fs/cachefiles/io.c | 76 ++-- + fs/cachefiles/namei.c | 16 +- + fs/cachefiles/ondemand.c | 503 +++++++++++++++++++++++ + fs/erofs/Kconfig | 10 + + fs/erofs/Makefile | 1 + + fs/erofs/data.c | 26 +- + fs/erofs/decompressor.c | 2 - + fs/erofs/fscache.c | 363 ++++++++++++++++ + fs/erofs/inode.c | 4 + + fs/erofs/internal.h | 51 ++- + fs/erofs/namei.c | 5 +- + fs/erofs/super.c | 145 ++++++- + fs/erofs/sysfs.c | 4 +- + include/linux/fscache.h | 1 + + include/linux/netfs.h | 1 + + include/trace/events/cachefiles.h | 176 ++++++++ + include/uapi/linux/cachefiles.h | 68 +++ + 23 files changed, 1755 insertions(+), 85 deletions(-) + create mode 100644 fs/cachefiles/ondemand.c + create mode 100644 fs/erofs/fscache.c + create mode 100644 include/uapi/linux/cachefiles.h +Merging exfat/dev (1d404b899e32 exfat: reduce block requests when zeroing a cluster) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + block/bdev.c | 7 +++++++ + fs/exfat/exfat_fs.h | 1 + + fs/exfat/fatent.c | 41 +++++++++++++++++------------------------ + fs/exfat/misc.c | 10 ++++++++-- + fs/exfat/namei.c | 27 +-------------------------- + fs/exfat/super.c | 9 ++++++++- + include/linux/blkdev.h | 1 + + 7 files changed, 43 insertions(+), 53 deletions(-) +Merging ext3/for_next (cfb73d370782 Pull evictable fsnotify marks work from Amir.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 14 +++-- + fs/notify/dnotify/dnotify.c | 13 ++-- + fs/notify/fanotify/fanotify.h | 12 ++++ + fs/notify/fanotify/fanotify_user.c | 100 +++++++++++++++++++++---------- + fs/notify/fdinfo.c | 21 ++----- + fs/notify/fsnotify.c | 4 +- + fs/notify/group.c | 32 ++++++---- + fs/notify/inotify/inotify.h | 19 ++++++ + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 47 +++++++++------ + fs/notify/mark.c | 112 +++++++++++++++++++++++------------ + include/linux/fanotify.h | 1 + + include/linux/fsnotify_backend.h | 67 ++++++++++++++++----- + include/uapi/linux/fanotify.h | 1 + + kernel/audit_fsnotify.c | 5 +- + kernel/audit_tree.c | 34 +++++------ + kernel/audit_watch.c | 2 +- + 17 files changed, 321 insertions(+), 165 deletions(-) +Merging ext4/dev (23e3d7f7061f jbd2: fix a potential race while discarding reserved buffers after an abort) +$ 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 (6daa83cbee0d f2fs: extend stat_lock to avoid potential race in statfs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/checkpoint.c | 12 ++---- + fs/f2fs/f2fs.h | 23 +++++++++-- + fs/f2fs/file.c | 61 +++++++++++++++++++++++++---- + fs/f2fs/gc.c | 82 ++++++++++++++++++++++++++++++++++----- + fs/f2fs/namei.c | 10 +++-- + fs/f2fs/node.c | 25 ++++++------ + fs/f2fs/segment.c | 52 +++++++++++++++---------- + fs/f2fs/segment.h | 3 ++ + fs/f2fs/super.c | 13 ++++--- + include/trace/events/f2fs.h | 94 +++++++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 304 insertions(+), 71 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/dax.c | 2 +- + fs/fuse/dir.c | 7 ++++++- + fs/fuse/file.c | 39 ++++++++++++++++++++++++++------------- + 3 files changed, 33 insertions(+), 15 deletions(-) +Merging gfs2/for-next (db0c1968e935 gfs2: Variable rename) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/file.c | 48 ++++++++++++++++++++++++++---------------------- + fs/gfs2/glock.c | 39 +++++++++++++++++++++++++++++---------- + fs/gfs2/glock.h | 1 + + fs/gfs2/inode.c | 7 +++++-- + fs/gfs2/lops.c | 5 +++-- + fs/gfs2/ops_fstype.c | 14 ++++++++------ + fs/gfs2/quota.c | 13 +++++-------- + fs/gfs2/recovery.c | 22 ++++++++++------------ + fs/gfs2/super.c | 3 ++- + fs/gfs2/util.c | 5 +++-- + 10 files changed, 92 insertions(+), 65 deletions(-) +Merging jfs/jfs-next (0d4837fdb796 fs: jfs: fix possible NULL pointer dereference in dbFree()) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_dmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ksmbd/ksmbd-for-next (22da5264abf4 Merge tag '5.18-rc3-ksmbd-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (00c94ebec592 NFSv4: Don't invalidate inode attributes on delegation return) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/nfs4proc.c | 12 +++++++++++- + net/sunrpc/clnt.c | 11 +++++++---- + 2 files changed, 18 insertions(+), 5 deletions(-) +Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (5c2cb3833940 SUNRPC: Remove svc_rqst::rq_xprt_hlen) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'ort' strategy. + fs/nfsd/vfs.c | 10 ++-------- + include/linux/sunrpc/cache.h | 8 ++++---- + include/linux/sunrpc/svc.h | 2 -- + include/trace/events/sunrpc.h | 12 +++++------- + net/sunrpc/cache.c | 18 +++++++++++++++++- + net/sunrpc/debugfs.c | 3 +++ + net/sunrpc/fail.h | 2 +- + net/sunrpc/svc_xprt.c | 10 ++++------ + net/sunrpc/svcsock.c | 11 ----------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 - + 10 files changed, 36 insertions(+), 41 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (a44a027a8b2a Merge tag 'large-extent-counters-v9' of https://github.com/chandanr/linux into xfs-5.19-for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_alloc.c | 12 +- + fs/xfs/libxfs/xfs_alloc.h | 2 +- + fs/xfs/libxfs/xfs_attr.c | 3 + + fs/xfs/libxfs/xfs_bmap.c | 145 ++++---- + fs/xfs/libxfs/xfs_bmap.h | 58 +-- + fs/xfs/libxfs/xfs_bmap_btree.c | 9 +- + fs/xfs/libxfs/xfs_btree.c | 10 +- + fs/xfs/libxfs/xfs_btree.h | 26 +- + fs/xfs/libxfs/xfs_da_btree.h | 17 +- + fs/xfs/libxfs/xfs_da_format.h | 9 +- + fs/xfs/libxfs/xfs_dir2.c | 8 + + fs/xfs/libxfs/xfs_format.h | 180 +++++++--- + fs/xfs/libxfs/xfs_fs.h | 41 ++- + fs/xfs/libxfs/xfs_ialloc.c | 8 +- + fs/xfs/libxfs/xfs_ialloc.h | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 83 ++++- + fs/xfs/libxfs/xfs_inode_fork.c | 39 +- + fs/xfs/libxfs/xfs_inode_fork.h | 76 +++- + fs/xfs/libxfs/xfs_log_format.h | 34 +- + fs/xfs/libxfs/xfs_quota_defs.h | 49 ++- + fs/xfs/libxfs/xfs_rtbitmap.c | 9 +- + fs/xfs/libxfs/xfs_sb.c | 10 + + fs/xfs/libxfs/xfs_trans_resv.c | 11 +- + fs/xfs/libxfs/xfs_types.h | 11 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/inode.c | 20 +- + fs/xfs/scrub/rtbitmap.c | 9 +- + fs/xfs/xfs_bmap_item.c | 2 + + fs/xfs/xfs_bmap_util.c | 27 +- + fs/xfs/xfs_buf_item.h | 24 +- + fs/xfs/xfs_dquot.c | 3 + + fs/xfs/xfs_error.h | 20 +- + fs/xfs/xfs_file.c | 24 +- + fs/xfs/xfs_fsmap.c | 6 +- + fs/xfs/xfs_fsops.c | 7 +- + fs/xfs/xfs_icache.c | 9 +- + fs/xfs/xfs_inode.c | 80 +---- + fs/xfs/xfs_inode.h | 29 +- + fs/xfs/xfs_inode_item.c | 23 +- + fs/xfs/xfs_inode_item_recover.c | 141 +++++--- + fs/xfs/xfs_ioctl.c | 3 + + fs/xfs/xfs_iomap.c | 33 +- + fs/xfs/xfs_itable.c | 15 +- + fs/xfs/xfs_itable.h | 5 +- + fs/xfs/xfs_iwalk.h | 2 +- + fs/xfs/xfs_log.c | 766 +++++++++++++++++----------------------- + fs/xfs/xfs_log.h | 57 +-- + fs/xfs/xfs_log_cil.c | 169 ++++++--- + fs/xfs/xfs_log_priv.h | 55 +-- + fs/xfs/xfs_message.c | 58 ++- + fs/xfs/xfs_message.h | 55 +-- + fs/xfs/xfs_mount.c | 91 +++-- + fs/xfs/xfs_mount.h | 32 +- + fs/xfs/xfs_reflink.c | 5 + + fs/xfs/xfs_rtalloc.c | 41 +++ + fs/xfs/xfs_rtalloc.h | 9 +- + fs/xfs/xfs_super.c | 18 +- + fs/xfs/xfs_symlink.c | 5 - + fs/xfs/xfs_trace.h | 28 +- + fs/xfs/xfs_trans.c | 49 ++- + fs/xfs/xfs_trans.h | 8 +- + 61 files changed, 1547 insertions(+), 1235 deletions(-) +Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5dfb64fc1ffe] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/zonefs.rst | 52 +++++++++- + fs/zonefs/Makefile | 2 +- + fs/zonefs/super.c | 186 ++++++++++++++++++++++++++--------- + fs/zonefs/sysfs.c | 139 ++++++++++++++++++++++++++ + fs/zonefs/zonefs.h | 18 +++- + 5 files changed, 344 insertions(+), 53 deletions(-) + create mode 100644 fs/zonefs/sysfs.c +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/internal.h +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + arch/alpha/kernel/osf_sys.c | 1 + + fs/fsopen.c | 4 ++-- + fs/internal.h | 1 + + fs/namei.c | 11 ++--------- + fs/namespace.c | 13 ++++--------- + fs/nfs/nfs4file.c | 4 ++-- + include/linux/fs.h | 11 ----------- + include/linux/mount.h | 29 +++++++++++++++++------------ + kernel/usermode_driver.c | 4 ++-- + security/smack/smackfs.c | 1 + + 10 files changed, 32 insertions(+), 47 deletions(-) +Merging printk/for-next (bfc1f2749c23 Merge branch 'rework/kthreads' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging MAINTAINERS +Auto-merging kernel/panic.c +Merge made by the 'ort' strategy. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/printk-index.rst | 137 ++++ + MAINTAINERS | 2 + + drivers/tty/sysrq.c | 2 + + include/linux/console.h | 19 + + include/linux/printk.h | 82 ++- + kernel/hung_task.c | 11 +- + kernel/panic.c | 4 + + kernel/printk/printk.c | 1201 +++++++++++++++++++++++-------- + kernel/rcu/tree_stall.h | 2 + + kernel/reboot.c | 14 +- + kernel/watchdog.c | 4 + + kernel/watchdog_hld.c | 4 + + lib/dump_stack.c | 4 +- + lib/nmi_backtrace.c | 4 +- + 15 files changed, 1172 insertions(+), 319 deletions(-) + create mode 100644 Documentation/core-api/printk-index.rst +Merging pci/next (9507c62158a6 Merge branch 'remotes/lorenzo/pci/versatile') +$ 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/pci.c +Merge made by the 'ort' strategy. + Documentation/PCI/pci.rst | 4 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 65 ++-- + .../devicetree/bindings/pci/qcom,pcie.txt | 5 +- + arch/x86/include/asm/e820/api.h | 5 + + arch/x86/kernel/resource.c | 25 +- + arch/x86/pci/acpi.c | 5 + + drivers/pci/controller/cadence/pcie-cadence-ep.c | 3 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 3 +- + drivers/pci/controller/dwc/pcie-qcom.c | 24 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 - + drivers/pci/controller/pci-mvebu.c | 97 +++++- + drivers/pci/controller/pci-versatile.c | 3 +- + drivers/pci/controller/pcie-mediatek.c | 1 + + drivers/pci/controller/pcie-microchip-host.c | 2 +- + drivers/pci/controller/pcie-rockchip-ep.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 1 + + drivers/pci/hotplug/rpadlpar_core.c | 1 + + drivers/pci/hotplug/rpaphp_core.c | 2 + + drivers/pci/hotplug/rpaphp_pci.c | 1 + + drivers/pci/hotplug/rpaphp_slot.c | 1 + + drivers/pci/of.c | 70 ++++ + drivers/pci/p2pdma.c | 25 +- + drivers/pci/pci-acpi.c | 41 ++- + drivers/pci/pci-driver.c | 45 ++- + drivers/pci/pci.c | 360 ++++++++++++--------- + drivers/pci/pci.h | 15 + + drivers/pci/quirks.c | 47 +++ + include/linux/pci.h | 4 - + include/uapi/linux/pci_regs.h | 1 + + 29 files changed, 608 insertions(+), 260 deletions(-) +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (eb3f85f0fc6e Merge branch 'for-5.19/wacom' 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 +Auto-merging MAINTAINERS +Auto-merging drivers/hid/Kconfig +CONFLICT (content): Merge conflict in drivers/hid/Kconfig +Auto-merging drivers/hid/Makefile +CONFLICT (content): Merge conflict in drivers/hid/Makefile +Resolved 'drivers/hid/Kconfig' using previous resolution. +Resolved 'drivers/hid/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ffa400ad3d44] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 9 +- + drivers/hid/Kconfig | 12 ++ + drivers/hid/Makefile | 1 + + .../hid_descriptor/amd_sfh_hid_report_desc.h | 6 +- + drivers/hid/hid-elan.c | 2 - + drivers/hid/hid-google-atrus.c | 55 +++++++ + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-led.c | 2 +- + drivers/hid/hid-lenovo.c | 174 ++++++++++++++++++++- + drivers/hid/hid-multitouch.c | 9 ++ + drivers/hid/hid-uclogic-core.c | 89 ++++++++--- + drivers/hid/hid-uclogic-params.c | 60 ++++++- + drivers/hid/hid-uclogic-params.h | 173 +++++++++++++++----- + drivers/hid/hid-uclogic-rdesc.c | 115 +++++++++++++- + drivers/hid/hid-uclogic-rdesc.h | 30 +++- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 + + drivers/hid/wacom_sys.c | 2 +- + drivers/hid/wacom_wac.c | 43 ++++- + drivers/hid/wacom_wac.h | 5 + + 20 files changed, 696 insertions(+), 99 deletions(-) + create mode 100644 drivers/hid/hid-google-atrus.c +Merging i2c/i2c/for-next (05b42eff61a5 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-qup.txt | 40 -------- + .../devicetree/bindings/i2c/qcom,i2c-qup.yaml | 89 +++++++++++++++++ + drivers/i2c/busses/i2c-meson.c | 111 +++++++++++++++------ + drivers/i2c/busses/i2c-rcar.c | 31 +++++- + 4 files changed, 198 insertions(+), 73 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt + create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.yaml +Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (260c272ce947 hwmon: (pmbus) Register with thermal for PSC_TEMPERATURE) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adt7475.yaml | 22 + + Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 + + .../bindings/hwmon/microchip,lan966x.yaml | 53 + + .../devicetree/bindings/hwmon/ti,tmp401.yaml | 105 + + Documentation/hwmon/aquacomputer_d5next.rst | 7 +- + Documentation/hwmon/asus_ec_sensors.rst | 4 + + Documentation/hwmon/dell-smm-hwmon.rst | 9 + + Documentation/hwmon/hwmon-kernel-api.rst | 16 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lan966x.rst | 40 + + Documentation/hwmon/max16601.rst | 8 + + Documentation/hwmon/xdpe152c4.rst | 118 + + MAINTAINERS | 8 +- + drivers/hwmon/Kconfig | 38 +- + drivers/hwmon/Makefile | 3 + + drivers/hwmon/adt7475.c | 119 +- + drivers/hwmon/aquacomputer_d5next.c | 464 +++- + drivers/hwmon/asus-ec-sensors.c | 414 +++- + drivers/hwmon/bt1-pvt.c | 50 +- + drivers/hwmon/dell-smm-hwmon.c | 147 +- + drivers/hwmon/hwmon.c | 53 + + drivers/hwmon/intel-m10-bmc-hwmon.c | 11 +- + drivers/hwmon/jc42.c | 8 + + drivers/hwmon/lan966x-hwmon.c | 418 ++++ + drivers/hwmon/lm75.c | 14 + + drivers/hwmon/{nct6775.c => nct6775-core.c} | 2445 ++++++-------------- + drivers/hwmon/nct6775-platform.c | 1226 ++++++++++ + drivers/hwmon/nct6775.h | 252 ++ + drivers/hwmon/occ/common.c | 100 +- + drivers/hwmon/occ/common.h | 5 +- + drivers/hwmon/occ/p8_i2c.c | 2 +- + drivers/hwmon/occ/p9_sbe.c | 2 +- + drivers/hwmon/occ/sysfs.c | 137 +- + drivers/hwmon/peci/dimmtemp.c | 13 +- + drivers/hwmon/pmbus/Kconfig | 13 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc2978.c | 12 + + drivers/hwmon/pmbus/max16601.c | 13 +- + drivers/hwmon/pmbus/pmbus.h | 2 + + drivers/hwmon/pmbus/pmbus_core.c | 227 +- + drivers/hwmon/pmbus/xdpe152c4.c | 75 + + drivers/hwmon/tmp401.c | 46 +- + include/linux/hwmon.h | 3 + + include/linux/polynomial.h | 35 + + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/polynomial.c | 108 + + 47 files changed, 4693 insertions(+), 2160 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,lan966x.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml + create mode 100644 Documentation/hwmon/lan966x.rst + create mode 100644 Documentation/hwmon/xdpe152c4.rst + create mode 100644 drivers/hwmon/lan966x-hwmon.c + rename drivers/hwmon/{nct6775.c => nct6775-core.c} (66%) + create mode 100644 drivers/hwmon/nct6775-platform.c + create mode 100644 drivers/hwmon/nct6775.h + create mode 100644 drivers/hwmon/pmbus/xdpe152c4.c + create mode 100644 include/linux/polynomial.h + create mode 100644 lib/polynomial.c +Merging jc_docs/docs-next (81c653659d34 Documentation/sysctl: document max_rcu_stall_to_panic) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/core-api/index.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 11 +- + Documentation/admin-guide/kernel-parameters.txt | 318 ++++++++------- + Documentation/admin-guide/sysctl/kernel.rst | 7 + + Documentation/core-api/index.rst | 1 + + Documentation/{ => core-api}/watch_queue.rst | 0 + Documentation/dev-tools/ktap.rst | 18 +- + Documentation/dev-tools/kunit/architecture.rst | 2 +- + Documentation/dev-tools/testing-overview.rst | 63 +++ + Documentation/doc-guide/kernel-doc.rst | 2 + + Documentation/doc-guide/sphinx.rst | 5 +- + Documentation/driver-api/driver-model/devres.rst | 2 +- + Documentation/driver-api/thermal/intel_dptf.rst | 2 +- + Documentation/fault-injection/fault-injection.rst | 14 +- + Documentation/ide/ChangeLog.ide-cd.1994-2004 | 268 ------------- + Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 63 --- + Documentation/ide/ChangeLog.ide-tape.1995-2002 | 257 ------------ + Documentation/ide/changelogs.rst | 17 - + Documentation/ide/ide-tape.rst | 68 ---- + Documentation/ide/ide.rst | 265 ------------- + Documentation/ide/index.rst | 21 - + Documentation/ide/warm-plug-howto.rst | 18 - + Documentation/index.rst | 2 - + Documentation/kernel-hacking/hacking.rst | 36 +- + Documentation/kernel-hacking/locking.rst | 5 +- + Documentation/process/changes.rst | 8 +- + .../process/embargoed-hardware-issues.rst | 2 +- + Documentation/process/submitting-patches.rst | 7 +- + Documentation/scheduler/sched-stats.rst | 8 +- + Documentation/tools/rtla/common_appendix.rst | 3 +- + Documentation/translations/ja_JP/index.rst | 2 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 291 +++++++++++++- + Documentation/translations/zh_CN/index.rst | 2 +- + Documentation/translations/zh_CN/locking/index.rst | 42 ++ + .../translations/zh_CN/locking/spinlocks.rst | 149 +++++++ + Documentation/translations/zh_CN/process/howto.rst | 2 +- + .../translations/zh_CN/scheduler/index.rst | 2 + + .../translations/zh_CN/scheduler/sched-debug.rst | 51 +++ + .../translations/zh_CN/scheduler/schedutil.rst | 165 ++++++++ + .../translations/zh_CN/vm/damon/design.rst | 7 +- + Documentation/translations/zh_CN/vm/frontswap.rst | 196 +++++++++ + Documentation/translations/zh_CN/vm/hmm.rst | 361 +++++++++++++++++ + .../translations/zh_CN/vm/hugetlbfs_reserv.rst | 436 +++++++++++++++++++++ + Documentation/translations/zh_CN/vm/hwpoison.rst | 166 ++++++++ + Documentation/translations/zh_CN/vm/index.rst | 29 +- + .../translations/zh_CN/vm/memory-model.rst | 135 +++++++ + .../translations/zh_CN/vm/mmu_notifier.rst | 97 +++++ + Documentation/translations/zh_CN/vm/numa.rst | 101 +++++ + .../zh_CN/vm/overcommit-accounting.rst | 86 ++++ + Documentation/translations/zh_CN/vm/page_frags.rst | 38 ++ + Documentation/translations/zh_CN/vm/page_owner.rst | 116 ++++++ + .../translations/zh_CN/vm/page_table_check.rst | 56 +++ + .../translations/zh_CN/vm/remap_file_pages.rst | 32 ++ + .../zh_CN/vm/split_page_table_lock.rst | 96 +++++ + Documentation/translations/zh_CN/vm/z3fold.rst | 31 ++ + Documentation/translations/zh_CN/vm/zsmalloc.rst | 78 ++++ + Documentation/vm/arch_pgtable_helpers.rst | 10 +- + Documentation/w1/slaves/w1_therm.rst | 9 +- + Documentation/x86/exception-tables.rst | 23 +- + Documentation/x86/index.rst | 2 +- + Documentation/x86/intel-iommu.rst | 115 ------ + Documentation/x86/iommu.rst | 151 +++++++ + 63 files changed, 3225 insertions(+), 1351 deletions(-) + rename Documentation/{ => core-api}/watch_queue.rst (100%) + delete mode 100644 Documentation/ide/ChangeLog.ide-cd.1994-2004 + delete mode 100644 Documentation/ide/ChangeLog.ide-floppy.1996-2002 + delete mode 100644 Documentation/ide/ChangeLog.ide-tape.1995-2002 + delete mode 100644 Documentation/ide/changelogs.rst + delete mode 100644 Documentation/ide/ide-tape.rst + delete mode 100644 Documentation/ide/ide.rst + delete mode 100644 Documentation/ide/index.rst + delete mode 100644 Documentation/ide/warm-plug-howto.rst + create mode 100644 Documentation/translations/zh_CN/locking/index.rst + create mode 100644 Documentation/translations/zh_CN/locking/spinlocks.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-debug.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/schedutil.rst + create mode 100644 Documentation/translations/zh_CN/vm/frontswap.rst + create mode 100644 Documentation/translations/zh_CN/vm/hmm.rst + create mode 100644 Documentation/translations/zh_CN/vm/hugetlbfs_reserv.rst + create mode 100644 Documentation/translations/zh_CN/vm/hwpoison.rst + create mode 100644 Documentation/translations/zh_CN/vm/memory-model.rst + create mode 100644 Documentation/translations/zh_CN/vm/mmu_notifier.rst + create mode 100644 Documentation/translations/zh_CN/vm/numa.rst + create mode 100644 Documentation/translations/zh_CN/vm/overcommit-accounting.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_frags.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_owner.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_table_check.rst + create mode 100644 Documentation/translations/zh_CN/vm/remap_file_pages.rst + create mode 100644 Documentation/translations/zh_CN/vm/split_page_table_lock.rst + create mode 100644 Documentation/translations/zh_CN/vm/z3fold.rst + create mode 100644 Documentation/translations/zh_CN/vm/zsmalloc.rst + delete mode 100644 Documentation/x86/intel-iommu.rst + create mode 100644 Documentation/x86/iommu.rst +Merging v4l-dvb/master (3d59142ad94c media: dvb-usb: dib0700_devices: use an enum for the device number) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (6c1c1eb8c87d media: ext-ctrls-codec.rst: fix indentation) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/vimc.dot | 14 +- + .../devicetree/bindings/media/rockchip-vpu.yaml | 1 + + Documentation/driver-api/media/cec-core.rst | 13 +- + Documentation/driver-api/media/v4l2-subdev.rst | 69 +++ + .../media/mediactl/media-controller-model.rst | 6 + + .../userspace-api/media/mediactl/media-types.rst | 17 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 22 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 19 + + drivers/media/cec/core/cec-adap.c | 282 +++++---- + drivers/media/cec/core/cec-api.c | 24 +- + drivers/media/cec/core/cec-core.c | 18 +- + drivers/media/cec/core/cec-pin-priv.h | 11 + + drivers/media/cec/core/cec-pin.c | 23 +- + drivers/media/cec/core/cec-priv.h | 10 + + drivers/media/common/saa7146/saa7146_video.c | 1 - + drivers/media/i2c/ccs/ccs-core.c | 36 +- + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/dw9768.c | 6 - + drivers/media/i2c/max9286.c | 19 +- + drivers/media/i2c/ov5645.c | 6 +- + drivers/media/i2c/ov5695.c | 2 +- + drivers/media/i2c/ov7640.c | 33 +- + drivers/media/mc/mc-device.c | 21 +- + drivers/media/mc/mc-entity.c | 80 ++- + drivers/media/pci/bt8xx/bttv-driver.c | 2 - + drivers/media/pci/cx18/cx18-ioctl.c | 2 - + drivers/media/pci/cx23885/cx23885-core.c | 6 +- + drivers/media/pci/cx25821/cx25821-core.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 1 - + drivers/media/pci/cx88/cx88-video.c | 1 - + drivers/media/pci/dt3155/dt3155.c | 3 - + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 - + drivers/media/pci/ivtv/ivtv-ioctl.c | 1 - + drivers/media/pci/meye/meye.c | 1 - + drivers/media/pci/saa7134/saa7134-video.c | 4 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 1 - + drivers/media/pci/saa7164/saa7164-vbi.c | 1 - + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 - + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 - + drivers/media/pci/sta2x11/sta2x11_vip.c | 4 - + drivers/media/pci/tw5864/tw5864-video.c | 1 - + drivers/media/pci/tw68/tw68-video.c | 3 - + drivers/media/pci/tw686x/tw686x-video.c | 2 - + drivers/media/platform/allegro-dvt/allegro-core.c | 5 - + drivers/media/platform/amphion/vdec.c | 2 +- + drivers/media/platform/chips-media/coda-bit.c | 4 +- + drivers/media/platform/chips-media/coda-common.c | 118 ++-- + drivers/media/platform/chips-media/coda-jpeg.c | 24 +- + drivers/media/platform/chips-media/coda.h | 7 + + drivers/media/platform/marvell/cafe-driver.c | 1 - + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 2 - + drivers/media/platform/nxp/Kconfig | 1 - + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 4 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 64 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 2 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 669 ++++++++++----------- + drivers/media/platform/qcom/camss/camss-video.c | 4 - + drivers/media/platform/qcom/venus/core.h | 1 + + drivers/media/platform/qcom/venus/helpers.c | 85 ++- + drivers/media/platform/qcom/venus/helpers.h | 1 + + drivers/media/platform/qcom/venus/hfi.c | 3 + + .../media/platform/qcom/venus/hfi_platform_v4.c | 4 +- + .../media/platform/qcom/venus/hfi_platform_v6.c | 4 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 4 +- + drivers/media/platform/qcom/venus/vdec.c | 37 +- + drivers/media/platform/qcom/venus/venc.c | 6 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 8 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 2 - + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 13 +- + drivers/media/platform/renesas/rcar_jpu.c | 2 - + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 - + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 10 +- + drivers/media/platform/renesas/vsp1/vsp1_histo.c | 2 - + drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 - + .../media/platform/samsung/exynos-gsc/gsc-m2m.c | 5 - + drivers/media/platform/samsung/exynos4-is/common.c | 2 - + .../media/platform/samsung/exynos4-is/fimc-lite.c | 4 - + .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 2 - + .../media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c | 1 - + .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.c | 2 - + .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 2 - + drivers/media/platform/st/stm32/stm32-dcmi.c | 2 - + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 2 - + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 4 - + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 2 - + drivers/media/platform/ti/cal/cal-video.c | 4 - + drivers/media/platform/ti/cal/cal.c | 2 - + drivers/media/platform/ti/davinci/vpbe_display.c | 2 - + drivers/media/platform/ti/davinci/vpif_capture.c | 2 - + drivers/media/platform/ti/davinci/vpif_display.c | 2 - + drivers/media/platform/video-mux.c | 4 +- + drivers/media/radio/radio-maxiradio.c | 2 - + drivers/media/rc/meson-ir-tx.c | 4 +- + drivers/media/v4l2-core/tuner-core.c | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 33 +- + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 9 + + drivers/media/v4l2-core/v4l2-ioctl.c | 6 + + drivers/media/v4l2-core/v4l2-subdev.c | 214 ++++++- + drivers/staging/media/hantro/hantro_drv.c | 18 +- + drivers/staging/media/hantro/hantro_hw.h | 1 + + drivers/staging/media/hantro/hantro_v4l2.c | 67 ++- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 14 + + drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 4 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 20 + + drivers/staging/media/ipu3/ipu3-v4l2.c | 1 + + drivers/staging/media/ipu3/ipu3.c | 25 +- + drivers/staging/media/tegra-video/vi.c | 10 +- + include/media/cec.h | 12 + + include/media/i2c/mt9t112.h | 2 +- + include/media/i2c/wm8775.h | 2 +- + include/media/media-device.h | 51 +- + include/media/media-entity.h | 21 +- + include/media/v4l2-subdev.h | 243 +++++++- + include/uapi/linux/cec.h | 20 + + include/uapi/linux/media.h | 4 +- + include/uapi/linux/v4l2-controls.h | 5 + + include/uapi/linux/videodev2.h | 2 + + 118 files changed, 1790 insertions(+), 928 deletions(-) +Merging pm/linux-next (d3fa656ae5f3 Merge branch 'pm-cpuidle-next' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/pci/pci-acpi.c +Merge made by the 'ort' strategy. + Documentation/firmware-guide/acpi/enumeration.rst | 3 +- + Documentation/power/energy-model.rst | 24 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/cpu/mce/apei.c | 8 +- + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 4 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 61 ++- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 23 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 40 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 6 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 3 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/apei/einj.c | 3 + + drivers/acpi/apei/erst-dbg.c | 3 +- + drivers/acpi/apei/erst.c | 77 ++- + drivers/acpi/bgrt.c | 2 +- + drivers/acpi/bus.c | 26 + + drivers/acpi/device_pm.c | 83 ++- + drivers/acpi/dptf/dptf_power.c | 4 +- + drivers/acpi/pci_root.c | 2 + + drivers/acpi/property.c | 54 +- + drivers/acpi/spcr.c | 1 + + drivers/acpi/sysfs.c | 25 +- + drivers/base/power/common.c | 8 +- + drivers/base/power/domain.c | 77 +-- + drivers/base/power/runtime.c | 53 +- + drivers/base/property.c | 185 +++---- + drivers/cpufreq/cpufreq.c | 5 +- + drivers/cpufreq/cpufreq_governor.c | 20 +- + drivers/cpufreq/cpufreq_governor.h | 1 + + drivers/cpufreq/intel_pstate.c | 1 + + drivers/cpufreq/mediatek-cpufreq-hw.c | 4 +- + drivers/cpufreq/pasemi-cpufreq.c | 1 - + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/cpufreq/pmac64-cpufreq.c | 2 +- + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 4 +- + drivers/cpuidle/cpuidle-psci.c | 46 ++ + drivers/idle/intel_idle.c | 133 +++++ + drivers/iio/chemical/scd30.h | 5 +- + drivers/iio/chemical/scd30_core.c | 10 +- + drivers/iio/chemical/scd30_i2c.c | 3 +- + drivers/iio/chemical/scd30_serial.c | 3 +- + drivers/of/property.c | 34 ++ + drivers/opp/of.c | 6 +- + drivers/pci/pci-acpi.c | 3 + + drivers/powercap/dtpm_cpu.c | 2 +- + drivers/powercap/intel_rapl_common.c | 1 + + drivers/thermal/cpufreq_cooling.c | 2 +- + drivers/thermal/devfreq_cooling.c | 33 +- + drivers/thermal/hisi_thermal.c | 6 +- + .../intel/int340x_thermal/int3400_thermal.c | 24 +- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_bus.h | 3 + + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 18 +- + include/acpi/actbl2.h | 175 ++++-- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 19 +- + include/acpi/acuuid.h | 2 +- + include/acpi/apei.h | 2 + + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/linux/energy_model.h | 35 +- + include/linux/fwnode.h | 15 +- + include/linux/pm.h | 14 +- + include/linux/pm_domain.h | 6 +- + include/linux/pm_runtime.h | 10 +- + include/linux/property.h | 12 +- + include/linux/suspend.h | 44 +- + kernel/power/Makefile | 6 +- + kernel/power/energy_model.c | 63 ++- + kernel/power/main.c | 29 - + kernel/power/process.c | 3 - + kernel/power/snapshot.c | 12 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + tools/power/x86/turbostat/Makefile | 2 +- + tools/power/x86/turbostat/turbostat.8 | 2 +- + tools/power/x86/turbostat/turbostat.c | 594 +++++++++++++-------- + 238 files changed, 1688 insertions(+), 846 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (a3b8d1b12c6b cpufreq: mediatek: Fix NULL pointer dereference in mediatek-cpufreq) +$ 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 arch/arm64/boot/dts/nvidia/tegra234.dtsi +Merge made by the 'ort' strategy. + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 52 ++++ + drivers/cpufreq/mediatek-cpufreq.c | 289 ++++++++++++--------- + drivers/cpufreq/tegra194-cpufreq.c | 246 +++++++++++++++--- + 3 files changed, 424 insertions(+), 163 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml +Merging cpupower/cpupower (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (5d521a307526 PM / devfreq: rk3399_dmc: Avoid static (reused) profile) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 212 ------------ + .../memory-controllers/rockchip,rk3399-dmc.yaml | 384 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 299 +++++++--------- + 3 files changed, 518 insertions(+), 377 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml +Merging opp/opp/linux-next (3e1fac9324f8 dt-bindings: opp: opp-v2-kryo-cpu: Remove SMEM) +$ 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 drivers/opp/of.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 56 ++++++++++------------ + drivers/opp/core.c | 25 ++++------ + drivers/opp/debugfs.c | 10 ++-- + drivers/opp/of.c | 2 +- + 4 files changed, 44 insertions(+), 49 deletions(-) +Merging thermal/thermal/linux-next (c07a7c8dbcd8 tools/thermal: Add thermal daemon skeleton) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 110 +++- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 4 +- + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 1 + + MAINTAINERS | 1 + + drivers/iio/adc/qcom-vadc-common.c | 11 + + drivers/thermal/broadcom/bcm2711_thermal.c | 5 +- + drivers/thermal/k3_bandgap.c | 5 + + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 486 +++++++++++++++-- + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/rcar_thermal.c | 17 +- + drivers/thermal/thermal_of.c | 12 + + include/linux/iio/adc/qcom-vadc-common.h | 2 + + include/linux/thermal.h | 3 + + tools/Makefile | 36 +- + tools/lib/thermal/.gitignore | 2 + + tools/lib/thermal/Build | 5 + + tools/lib/thermal/Makefile | 165 ++++++ + tools/lib/thermal/commands.c | 349 +++++++++++++ + tools/lib/thermal/events.c | 164 ++++++ + tools/lib/thermal/include/thermal.h | 142 +++++ + tools/lib/thermal/libthermal.map | 25 + + tools/lib/thermal/libthermal.pc.template | 12 + + tools/lib/thermal/sampling.c | 75 +++ + tools/lib/thermal/thermal.c | 135 +++++ + tools/lib/thermal/thermal_nl.c | 215 ++++++++ + tools/lib/thermal/thermal_nl.h | 46 ++ + tools/thermal/lib/Build | 3 + + tools/thermal/lib/Makefile | 158 ++++++ + tools/thermal/lib/libthermal_tools.pc.template | 12 + + tools/thermal/lib/log.c | 77 +++ + tools/thermal/lib/log.h | 31 ++ + tools/thermal/lib/mainloop.c | 120 +++++ + tools/thermal/lib/mainloop.h | 15 + + tools/thermal/lib/thermal-tools.h | 10 + + tools/thermal/lib/uptimeofday.c | 40 ++ + tools/thermal/lib/uptimeofday.h | 12 + + tools/thermal/thermal-engine/Build | 1 + + tools/thermal/thermal-engine/Makefile | 28 + + tools/thermal/thermal-engine/thermal-engine.c | 341 ++++++++++++ + tools/thermal/thermometer/Build | 1 + + tools/thermal/thermometer/Makefile | 26 + + tools/thermal/thermometer/thermometer.8 | 92 ++++ + tools/thermal/thermometer/thermometer.c | 572 +++++++++++++++++++++ + tools/thermal/thermometer/thermometer.conf | 5 + + 44 files changed, 3522 insertions(+), 53 deletions(-) + create mode 100644 tools/lib/thermal/.gitignore + create mode 100644 tools/lib/thermal/Build + create mode 100644 tools/lib/thermal/Makefile + create mode 100644 tools/lib/thermal/commands.c + create mode 100644 tools/lib/thermal/events.c + create mode 100644 tools/lib/thermal/include/thermal.h + create mode 100644 tools/lib/thermal/libthermal.map + create mode 100644 tools/lib/thermal/libthermal.pc.template + create mode 100644 tools/lib/thermal/sampling.c + create mode 100644 tools/lib/thermal/thermal.c + create mode 100644 tools/lib/thermal/thermal_nl.c + create mode 100644 tools/lib/thermal/thermal_nl.h + create mode 100644 tools/thermal/lib/Build + create mode 100644 tools/thermal/lib/Makefile + create mode 100644 tools/thermal/lib/libthermal_tools.pc.template + create mode 100644 tools/thermal/lib/log.c + create mode 100644 tools/thermal/lib/log.h + create mode 100644 tools/thermal/lib/mainloop.c + create mode 100644 tools/thermal/lib/mainloop.h + create mode 100644 tools/thermal/lib/thermal-tools.h + create mode 100644 tools/thermal/lib/uptimeofday.c + create mode 100644 tools/thermal/lib/uptimeofday.h + create mode 100644 tools/thermal/thermal-engine/Build + create mode 100644 tools/thermal/thermal-engine/Makefile + create mode 100644 tools/thermal/thermal-engine/thermal-engine.c + create mode 100644 tools/thermal/thermometer/Build + create mode 100644 tools/thermal/thermometer/Makefile + create mode 100644 tools/thermal/thermometer/thermometer.8 + create mode 100644 tools/thermal/thermometer/thermometer.c + create mode 100644 tools/thermal/thermometer/thermometer.conf +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (8e51ec6146fd dlm: use kref_put_lock in __put_lkb) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/dir.c | 2 +- + fs/dlm/dlm_internal.h | 66 ++--- + fs/dlm/lock.c | 654 +++++++++++++++++++++++++++----------------------- + fs/dlm/lockspace.c | 12 + + fs/dlm/lockspace.h | 1 + + fs/dlm/lowcomms.c | 12 +- + fs/dlm/member.c | 11 +- + fs/dlm/midcomms.c | 61 +++-- + fs/dlm/plock.c | 178 ++++++-------- + fs/dlm/rcom.c | 120 ++++----- + fs/dlm/recover.c | 49 ++-- + fs/dlm/requestqueue.c | 20 +- + fs/dlm/user.c | 16 +- + fs/dlm/util.c | 92 +------ + fs/dlm/util.h | 8 +- + 15 files changed, 633 insertions(+), 669 deletions(-) +Merging rdma/for-next (ff815a89398d RDMA/core: Avoid flush_workqueue(system_unbound_wq) usage) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Auto-merging drivers/infiniband/sw/rxe/rxe_resp.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/device.c | 26 +- + drivers/infiniband/core/nldev.c | 2 +- + drivers/infiniband/core/sa_query.c | 16 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 383 +---- + drivers/infiniband/core/verbs.c | 8 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/verbs.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 11 - + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 29 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 20 - + drivers/infiniband/hw/irdma/hw.c | 4 - + drivers/infiniband/hw/irdma/main.h | 1 - + drivers/infiniband/hw/irdma/puda.c | 7 +- + drivers/infiniband/hw/irdma/verbs.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 8 +- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/fs.c | 226 +-- + drivers/infiniband/hw/mlx5/main.c | 155 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 89 +- + drivers/infiniband/hw/mlx5/mr.c | 421 +----- + drivers/infiniband/hw/mlx5/odp.c | 63 +- + drivers/infiniband/hw/mlx5/qp.c | 1 + + drivers/infiniband/hw/mlx5/umr.c | 700 +++++++++ + drivers/infiniband/hw/mlx5/umr.h | 97 ++ + drivers/infiniband/hw/mlx5/wr.c | 377 +---- + drivers/infiniband/hw/mlx5/wr.h | 60 + + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 3 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 11 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 15 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 3 +- + drivers/infiniband/sw/rdmavt/qp.c | 6 +- + drivers/infiniband/sw/rxe/rxe.c | 1 + + drivers/infiniband/sw/rxe/rxe_mw.c | 8 + + drivers/infiniband/sw/rxe/rxe_opcode.c | 2 - + drivers/infiniband/sw/rxe/rxe_param.h | 2 - + drivers/infiniband/sw/rxe/rxe_qp.c | 14 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 1 - + drivers/infiniband/sw/rxe/rxe_req.c | 11 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 1 - + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/sw/siw/siw_verbs.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 12 +- + .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 36 - + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 179 --- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 96 -- + .../mellanox/mlx5/core/accel/ipsec_offload.h | 38 - + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 125 -- + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 156 -- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en/params.c | 19 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 11 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 30 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 31 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 5 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.h | 7 +- + .../mlx5/core/{accel => en_accel}/ipsec_offload.c | 95 +- + .../mellanox/mlx5/core/en_accel/ipsec_offload.h | 14 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 245 +-- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 3 - + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 63 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 71 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 86 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + .../core/en_accel/{tls_stats.c => ktls_stats.c} | 51 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 20 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 28 +- + .../mellanox/mlx5/core/en_accel/ktls_utils.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 247 --- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 132 -- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 390 ----- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 91 -- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 - + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 3 - + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 1582 -------------------- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 62 - + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 622 -------- + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 74 - + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 +- + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/target/rdma.c | 4 +- + fs/cifs/smbdirect.c | 2 +- + include/linux/mlx5/accel.h | 35 +- + include/linux/mlx5/driver.h | 3 - + include/linux/mlx5/mlx5_ifc_fpga.h | 211 --- + include/linux/mlx5/port.h | 2 +- + include/rdma/ib_verbs.h | 144 +- + include/rdma/opa_vnic.h | 3 +- + include/uapi/rdma/ib_user_verbs.h | 42 + + net/rds/ib.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + 111 files changed, 1587 insertions(+), 6544 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/umr.c + create mode 100644 drivers/infiniband/hw/mlx5/umr.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h + rename drivers/net/ethernet/mellanox/mlx5/core/{accel => en_accel}/ipsec_offload.c (84%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.h + rename drivers/net/ethernet/mellanox/mlx5/core/en_accel/{tls_stats.c => ktls_stats.c} (63%) + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h +Merging net-next/master (0530a683fc85 Merge branch 'vsock-virtio-add-support-for-device-suspend-resume') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Auto-merging drivers/net/dsa/microchip/ksz9477.c +Auto-merging drivers/net/dsa/mt7530.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/ti/cpsw_new.c +Auto-merging net/can/isotp.c +Auto-merging net/ipv4/igmp.c +Auto-merging net/nfc/core.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging tools/testing/selftests/net/forwarding/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/net/forwarding/Makefile +Resolved 'tools/testing/selftests/net/forwarding/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d23c354c241b] 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/devices.txt | 2 +- + Documentation/bpf/libbpf/index.rst | 3 +- + .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml | 42 + + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 50 + + .../bindings/net/aspeed,ast2600-mdio.yaml | 6 + + .../devicetree/bindings/net/can/ctu,ctucanfd.yaml | 63 + + .../bindings/net/can/microchip,mcp251xfd.yaml | 19 +- + .../bindings/net/can/renesas,rcar-canfd.yaml | 2 + + .../devicetree/bindings/net/cdns,macb.yaml | 8 - + .../devicetree/bindings/net/ethernet-phy.yaml | 9 + + .../devicetree/bindings/net/mediatek,net.yaml | 297 ++ + .../devicetree/bindings/net/mediatek-net.txt | 98 - + Documentation/devicetree/bindings/net/micrel.txt | 9 + + .../bindings/net/microchip,lan966x-switch.yaml | 4 +- + .../devicetree/bindings/net/mscc,miim.yaml | 61 + + .../devicetree/bindings/net/mscc-miim.txt | 26 - + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../device_drivers/can/ctu/ctucanfd-driver.rst | 639 +++++ + .../device_drivers/can/ctu/fsm_txt_buffer_user.svg | 151 ++ + .../networking/device_drivers/can/index.rst | 1 + + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/marvell/octeon_ep.rst | 35 + + Documentation/networking/device_drivers/index.rst | 1 - + .../networking/device_drivers/wan/index.rst | 18 - + .../networking/device_drivers/wan/z8530book.rst | 256 -- + .../networking/devlink/devlink-linecard.rst | 126 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/mlxsw.rst | 33 + + Documentation/networking/dsa/dsa.rst | 17 + + Documentation/networking/ethtool-netlink.rst | 8 + + Documentation/networking/ip-sysctl.rst | 27 + + Documentation/networking/mptcp-sysctl.rst | 18 + + MAINTAINERS | 31 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/boot/dts/aspeed-g6.dtsi | 4 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 32 +- + arch/arm64/include/asm/insn.h | 9 + + arch/arm64/lib/insn.c | 67 +- + arch/arm64/net/bpf_jit.h | 17 + + arch/arm64/net/bpf_jit_comp.c | 255 +- + arch/mips/configs/gpr_defconfig | 5 - + arch/mips/configs/mtx1_defconfig | 5 - + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/riscv/net/bpf_jit.h | 67 + + arch/riscv/net/bpf_jit_comp64.c | 110 +- + arch/sparc/include/uapi/asm/socket.h | 1 + + drivers/atm/Kconfig | 79 - + drivers/atm/Makefile | 4 - + drivers/atm/ambassador.c | 2400 ---------------- + drivers/atm/ambassador.h | 648 ----- + drivers/atm/firestream.c | 2057 -------------- + drivers/atm/firestream.h | 502 ---- + drivers/atm/horizon.c | 2853 -------------------- + drivers/atm/horizon.h | 492 ---- + drivers/atm/nicstarmac.c | 5 - + drivers/atm/uPD98401.h | 293 -- + drivers/atm/uPD98402.c | 266 -- + drivers/atm/uPD98402.h | 107 - + drivers/atm/zatm.c | 1652 ------------ + drivers/atm/zatm.h | 104 - + drivers/isdn/mISDN/socket.c | 2 +- + drivers/media/rc/bpf-lirc.c | 8 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/can/Kconfig | 1 + + drivers/net/can/Makefile | 1 + + drivers/net/can/ctucanfd/Kconfig | 34 + + drivers/net/can/ctucanfd/Makefile | 10 + + drivers/net/can/ctucanfd/ctucanfd.h | 82 + + drivers/net/can/ctucanfd/ctucanfd_base.c | 1462 ++++++++++ + drivers/net/can/ctucanfd/ctucanfd_kframe.h | 77 + + drivers/net/can/ctucanfd/ctucanfd_kregs.h | 325 +++ + drivers/net/can/ctucanfd/ctucanfd_pci.c | 294 ++ + drivers/net/can/ctucanfd/ctucanfd_platform.c | 131 + + drivers/net/can/dev/bittiming.c | 2 +- + drivers/net/can/dev/rx-offload.c | 6 +- + drivers/net/can/flexcan/flexcan-core.c | 16 +- + drivers/net/can/m_can/m_can.c | 11 +- + drivers/net/can/mscan/mpc5xxx_can.c | 2 + + drivers/net/can/sja1000/Kconfig | 2 +- + drivers/net/can/sja1000/tscan1.c | 7 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 25 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c | 2 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 12 +- + drivers/net/can/ti_hecc.c | 4 +- + drivers/net/can/xilinx_can.c | 4 +- + drivers/net/dsa/microchip/ksz8795.c | 35 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 3 - + drivers/net/dsa/microchip/ksz9477.c | 131 +- + drivers/net/dsa/microchip/ksz9477_reg.h | 4 - + drivers/net/dsa/microchip/ksz_common.c | 136 + + drivers/net/dsa/microchip/ksz_common.h | 10 + + drivers/net/dsa/mt7530.c | 332 +-- + drivers/net/dsa/mt7530.h | 26 +- + drivers/net/dsa/mv88e6xxx/chip.c | 56 +- + drivers/net/dsa/ocelot/felix.c | 1 - + drivers/net/dsa/ocelot/felix.h | 1 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/dsa/qca8k.c | 145 +- + drivers/net/dsa/qca8k.h | 12 +- + drivers/net/dsa/sja1105/sja1105_main.c | 5 +- + drivers/net/eql.c | 3 +- + drivers/net/ethernet/alacritech/slic.h | 2 - + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 3 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 9 + + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 87 + + drivers/net/ethernet/aquantia/atlantic/aq_main.h | 2 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 136 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 5 + + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 409 ++- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 21 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 25 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 6 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 6 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 10 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.h | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 304 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 16 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 191 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 16 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 7 +- + drivers/net/ethernet/brocade/bna/bnad.c | 3 +- + drivers/net/ethernet/cadence/macb_main.c | 24 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 2 +- + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 2 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 22 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 - + drivers/net/ethernet/emulex/benet/be.h | 3 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/engleder/tsnep_main.c | 3 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/gianfar.h | 3 - + .../net/ethernet/fungible/funeth/funeth_devlink.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 17 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 2 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 141 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 6 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 8 +- + drivers/net/ethernet/ibm/ibmvnic.c | 310 ++- + drivers/net/ethernet/ibm/ibmvnic.h | 54 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 25 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 49 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 39 +- + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 489 ++-- + drivers/net/ethernet/intel/ice/ice_switch.h | 12 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 29 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 53 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 53 +- + drivers/net/ethernet/marvell/Kconfig | 2 + + drivers/net/ethernet/marvell/Makefile | 1 + + drivers/net/ethernet/marvell/mvneta.c | 20 +- + drivers/net/ethernet/marvell/octeon_ep/Kconfig | 20 + + drivers/net/ethernet/marvell/octeon_ep/Makefile | 9 + + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 737 +++++ + .../net/ethernet/marvell/octeon_ep/octep_config.h | 204 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 245 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 170 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 194 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 299 ++ + .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 463 ++++ + .../net/ethernet/marvell/octeon_ep/octep_main.c | 1176 ++++++++ + .../net/ethernet/marvell/octeon_ep/octep_main.h | 357 +++ + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 367 +++ + drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 508 ++++ + drivers/net/ethernet/marvell/octeon_ep/octep_rx.h | 199 ++ + drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 335 +++ + drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 284 ++ + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +- + .../net/ethernet/marvell/prestera/prestera_acl.c | 42 +- + .../net/ethernet/marvell/prestera/prestera_acl.h | 12 + + .../ethernet/marvell/prestera/prestera_flower.c | 28 + + .../net/ethernet/marvell/prestera/prestera_hw.c | 81 + + .../net/ethernet/marvell/prestera/prestera_hw.h | 13 + + .../ethernet/marvell/prestera/prestera_router.c | 11 +- + drivers/net/ethernet/marvell/skge.c | 3 +- + drivers/net/ethernet/marvell/sky2.c | 3 +- + drivers/net/ethernet/mediatek/Kconfig | 4 + + drivers/net/ethernet/mediatek/Makefile | 5 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 135 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 15 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 369 ++- + drivers/net/ethernet/mediatek/mtk_ppe.h | 89 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 1 - + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 189 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 880 ++++++ + drivers/net/ethernet/mediatek/mtk_wed.h | 135 + + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 175 ++ + drivers/net/ethernet/mediatek/mtk_wed_ops.c | 8 + + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 251 ++ + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 58 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 80 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 681 +++-- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 47 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 311 ++- + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 1373 ++++++++++ + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 250 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 39 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 544 +++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 282 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 35 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 35 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 + + drivers/net/ethernet/microchip/lan966x/Makefile | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 842 ++++++ + .../net/ethernet/microchip/lan966x/lan966x_main.c | 84 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 121 + + .../net/ethernet/microchip/lan966x/lan966x_port.c | 3 + + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 276 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 146 + + drivers/net/ethernet/mscc/ocelot.c | 5 + + drivers/net/ethernet/mscc/ocelot_vcap.c | 4 - + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 - + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.h | 2 - + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 2 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 25 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c | 43 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 3 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 26 +- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +- + drivers/net/ethernet/qlogic/qed/Makefile | 3 +- + .../ethernet/qlogic/qed/qed_nvmetcp_ip_services.c | 238 -- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 10 +- + drivers/net/ethernet/realtek/atp.h | 4 - + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/sfc/ef100.c | 27 +- + drivers/net/ethernet/sfc/ef100_nic.c | 6 +- + drivers/net/ethernet/sfc/ef100_sriov.c | 56 + + drivers/net/ethernet/sfc/ef100_sriov.h | 14 + + drivers/net/ethernet/sfc/efx.h | 1 - + drivers/net/ethernet/sfc/efx_channels.c | 52 +- + drivers/net/ethernet/sfc/efx_channels.h | 4 - + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/falcon/rx.c | 4 +- + drivers/net/ethernet/sfc/farch.c | 1 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 4 +- + drivers/net/ethernet/sfc/net_driver.h | 5 - + drivers/net/ethernet/sfc/tx.c | 3 +- + drivers/net/ethernet/smsc/smsc9420.c | 2 +- + drivers/net/ethernet/smsc/smsc9420.h | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 24 +- + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 6 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 33 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 180 ++ + drivers/net/ethernet/ti/am65-cpsw-qos.h | 8 + + drivers/net/ethernet/ti/cpsw.c | 42 +- + drivers/net/ethernet/ti/cpsw_ale.c | 66 + + drivers/net/ethernet/ti/cpsw_ale.h | 2 + + drivers/net/ethernet/ti/cpsw_new.c | 43 +- + drivers/net/ethernet/ti/cpsw_priv.c | 235 +- + drivers/net/ethernet/ti/cpsw_priv.h | 10 +- + drivers/net/ethernet/ti/davinci_emac.c | 12 +- + drivers/net/ethernet/ti/davinci_mdio.c | 18 +- + drivers/net/ethernet/ti/netcp_core.c | 5 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.h | 1 - + drivers/net/ethernet/via/via-velocity.c | 3 +- + drivers/net/ethernet/via/via-velocity.h | 1 - + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 55 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 2 +- + drivers/net/geneve.c | 10 +- + drivers/net/hamradio/Kconfig | 34 - + drivers/net/hamradio/Makefile | 1 - + drivers/net/hamradio/dmascc.c | 1450 ---------- + drivers/net/hyperv/hyperv_net.h | 69 +- + drivers/net/hyperv/netvsc.c | 16 +- + drivers/net/hyperv/netvsc_bpf.c | 101 +- + drivers/net/hyperv/netvsc_drv.c | 150 +- + drivers/net/ieee802154/Kconfig | 7 - + drivers/net/ieee802154/at86rf230.c | 163 +- + drivers/net/ieee802154/atusb.c | 37 +- + drivers/net/ieee802154/ca8210.c | 181 +- + drivers/net/ieee802154/mcr20a.c | 5 - + drivers/net/ipa/ipa_endpoint.c | 9 +- + drivers/net/mdio/mdio-aspeed.c | 138 +- + drivers/net/mdio/mdio-mscc-miim.c | 81 +- + drivers/net/netdevsim/fib.c | 9 +- + drivers/net/pcs/pcs-xpcs.c | 6 +- + drivers/net/phy/Kconfig | 7 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/adin1100.c | 292 ++ + drivers/net/phy/bcm87xx.c | 36 +- + drivers/net/phy/marvell.c | 16 +- + drivers/net/phy/micrel.c | 253 +- + drivers/net/phy/microchip_t1.c | 50 + + drivers/net/phy/phy-c45.c | 257 +- + drivers/net/phy/phy-core.c | 3 +- + drivers/net/phy/phy.c | 18 +- + drivers/net/phy/phy_device.c | 10 +- + drivers/net/phy/phylink.c | 64 +- + drivers/net/ppp/pppoe.c | 3 +- + drivers/net/usb/cdc_ether.c | 3 +- + drivers/net/usb/cdc_ncm.c | 8 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/qmi_wwan.c | 3 +- + drivers/net/usb/rndis_host.c | 47 +- + drivers/net/usb/sr9800.h | 2 +- + drivers/net/veth.c | 2 +- + drivers/net/wan/Kconfig | 72 - + drivers/net/wan/Makefile | 5 - + drivers/net/wan/cosa.c | 2052 -------------- + drivers/net/wan/cosa.h | 104 - + drivers/net/wan/hostess_sv11.c | 336 --- + drivers/net/wan/lmc/Makefile | 18 - + drivers/net/wan/lmc/lmc.h | 33 - + drivers/net/wan/lmc/lmc_debug.c | 65 - + drivers/net/wan/lmc/lmc_debug.h | 52 - + drivers/net/wan/lmc/lmc_ioctl.h | 255 -- + drivers/net/wan/lmc/lmc_main.c | 2009 -------------- + drivers/net/wan/lmc/lmc_media.c | 1206 --------- + drivers/net/wan/lmc/lmc_proto.c | 106 - + drivers/net/wan/lmc/lmc_proto.h | 18 - + drivers/net/wan/lmc/lmc_var.h | 468 ---- + drivers/net/wan/sealevel.c | 352 --- + drivers/net/wan/z85230.c | 1641 ----------- + drivers/net/wan/z85230.h | 407 --- + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wwan/wwan_hwsim.c | 22 +- + drivers/net/xen-netback/interface.c | 3 +- + drivers/s390/net/qeth_core.h | 2 - + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + include/linux/bpf-cgroup.h | 8 +- + include/linux/bpf.h | 231 +- + include/linux/bpf_local_storage.h | 4 +- + include/linux/bpf_verifier.h | 3 +- + include/linux/btf.h | 23 + + include/linux/can/rx-offload.h | 4 +- + include/linux/ethtool.h | 4 + + include/linux/icmpv6.h | 11 +- + include/linux/ieee802154.h | 81 +- + include/linux/ipv6.h | 5 +- + include/linux/mdio.h | 70 + + include/linux/netdevice.h | 111 +- + include/linux/phy.h | 5 +- + include/linux/phylink.h | 6 - + include/linux/ptp_clock_kernel.h | 4 + + include/linux/qed/qed_nvmetcp_ip_services_if.h | 29 - + include/linux/rtnetlink.h | 1 + + include/linux/skbuff.h | 91 +- + include/linux/soc/mediatek/mtk_wed.h | 131 + + include/linux/socket.h | 6 +- + include/linux/usb/rndis_host.h | 1 + + include/linux/usb/usbnet.h | 1 + + include/net/act_api.h | 3 +- + include/net/cfg802154.h | 6 +- + include/net/devlink.h | 66 +- + include/net/flow_dissector.h | 9 + + include/net/if_inet6.h | 8 + + include/net/ip_fib.h | 4 +- + include/net/mac802154.h | 19 + + include/net/mptcp.h | 3 +- + include/net/netfilter/nf_conntrack.h | 8 +- + include/net/page_pool.h | 21 + + include/net/ping.h | 4 +- + include/net/pkt_cls.h | 6 +- + include/net/route.h | 36 +- + include/net/rtnetlink.h | 16 +- + include/net/sctp/sctp.h | 2 +- + include/net/sock.h | 42 +- + include/net/strparser.h | 4 + + include/net/tc_act/tc_gact.h | 15 + + include/net/tc_act/tc_skbedit.h | 13 + + include/net/tcp.h | 45 +- + include/net/tls.h | 15 +- + include/net/udp.h | 8 +- + include/soc/mscc/ocelot.h | 7 + + include/trace/events/mptcp.h | 6 +- + include/trace/events/skb.h | 21 +- + include/trace/events/tcp.h | 47 +- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/atm_zatm.h | 47 - + include/uapi/linux/bpf.h | 12 + + include/uapi/linux/btf.h | 4 +- + include/uapi/linux/devlink.h | 28 + + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 5 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/mdio.h | 75 + + include/uapi/linux/neighbour.h | 2 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/tc_act/tc_skbedit.h | 2 + + include/uapi/linux/tipc_config.h | 28 +- + kernel/bpf/arraymap.c | 44 +- + kernel/bpf/bloom_filter.c | 6 +- + kernel/bpf/bpf_inode_storage.c | 10 +- + kernel/bpf/bpf_iter.c | 32 +- + kernel/bpf/bpf_local_storage.c | 29 +- + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/bpf_task_storage.c | 9 +- + kernel/bpf/btf.c | 634 ++++- + kernel/bpf/cgroup.c | 106 +- + kernel/bpf/cpumap.c | 6 +- + kernel/bpf/devmap.c | 10 +- + kernel/bpf/hashtab.c | 88 +- + kernel/bpf/helpers.c | 24 + + kernel/bpf/local_storage.c | 7 +- + kernel/bpf/lpm_trie.c | 6 +- + kernel/bpf/map_in_map.c | 5 +- + kernel/bpf/queue_stack_maps.c | 10 +- + kernel/bpf/reuseport_array.c | 6 +- + kernel/bpf/ringbuf.c | 10 +- + kernel/bpf/stackmap.c | 7 +- + kernel/bpf/syscall.c | 431 ++- + kernel/bpf/task_iter.c | 1 - + kernel/bpf/verifier.c | 507 +++- + kernel/sysctl.c | 79 - + kernel/trace/bpf_trace.c | 11 +- + lib/test_bpf.c | 315 ++- + net/appletalk/ddp.c | 3 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 3 +- + net/bluetooth/af_bluetooth.c | 7 +- + net/bluetooth/hci_sock.c | 3 +- + net/bpf/test_run.c | 67 +- + net/bridge/br_device.c | 1 + + net/bridge/br_fdb.c | 157 +- + net/bridge/br_mdb.c | 12 +- + net/bridge/br_netlink.c | 9 +- + net/bridge/br_private.h | 18 +- + net/bridge/br_switchdev.c | 3 +- + net/bridge/br_sysfs_br.c | 6 +- + net/caif/caif_socket.c | 2 +- + net/can/bcm.c | 7 +- + net/can/isotp.c | 4 +- + net/can/j1939/socket.c | 4 +- + net/can/raw.c | 8 +- + net/core/bpf_sk_storage.c | 11 +- + net/core/datagram.c | 7 +- + net/core/datagram.h | 15 - + net/core/dev.c | 102 +- + net/core/dev.h | 91 + + net/core/dev_addr_lists.c | 2 + + net/core/dev_ioctl.c | 2 + + net/core/devlink.c | 954 ++++++- + net/core/filter.c | 10 +- + net/core/flow_dissector.c | 20 + + net/core/link_watch.c | 1 + + net/core/net-procfs.c | 2 + + net/core/net-sysfs.c | 1 + + net/core/page_pool.c | 78 +- + net/core/rtnetlink.c | 403 +-- + net/core/skbuff.c | 63 +- + net/core/sock.c | 95 +- + net/core/sock_map.c | 10 +- + net/core/sysctl_net_core.c | 2 + + net/dccp/dccp.h | 4 +- + net/dccp/ipv4.c | 5 +- + net/dccp/ipv6.c | 2 +- + net/dccp/proto.c | 6 +- + net/dsa/dsa.c | 9 - + net/dsa/dsa_priv.h | 28 +- + net/dsa/port.c | 128 +- + net/dsa/slave.c | 31 +- + net/dsa/switch.c | 188 +- + net/dsa/tag_8021q.c | 10 +- + net/ethernet/eth.c | 2 +- + net/ethtool/common.c | 3 + + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 54 +- + net/ieee802154/socket.c | 12 +- + net/ipv4/Kconfig | 1 - + net/ipv4/af_inet.c | 11 +- + net/ipv4/arp.c | 7 +- + net/ipv4/datagram.c | 7 +- + net/ipv4/fib_frontend.c | 4 +- + net/ipv4/fib_rules.c | 2 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/fib_trie.c | 12 +- + net/ipv4/fou.c | 1 - + net/ipv4/icmp.c | 77 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ip_forward.c | 13 +- + net/ipv4/ip_gre.c | 50 +- + net/ipv4/ip_input.c | 1 + + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 4 + + net/ipv4/ping.c | 40 +- + net/ipv4/raw.c | 6 +- + net/ipv4/route.c | 51 +- + net/ipv4/tcp.c | 68 +- + net/ipv4/tcp_bbr.c | 20 +- + net/ipv4/tcp_bic.c | 14 +- + net/ipv4/tcp_bpf.c | 15 +- + net/ipv4/tcp_cdg.c | 30 +- + net/ipv4/tcp_cong.c | 30 +- + net/ipv4/tcp_cubic.c | 22 +- + net/ipv4/tcp_dctcp.c | 11 +- + net/ipv4/tcp_highspeed.c | 18 +- + net/ipv4/tcp_htcp.c | 10 +- + net/ipv4/tcp_hybla.c | 18 +- + net/ipv4/tcp_illinois.c | 12 +- + net/ipv4/tcp_input.c | 167 +- + net/ipv4/tcp_ipv4.c | 8 +- + net/ipv4/tcp_lp.c | 6 +- + net/ipv4/tcp_metrics.c | 12 +- + net/ipv4/tcp_nv.c | 24 +- + net/ipv4/tcp_output.c | 30 +- + net/ipv4/tcp_rate.c | 2 +- + net/ipv4/tcp_recovery.c | 15 +- + net/ipv4/tcp_scalable.c | 4 +- + net/ipv4/tcp_vegas.c | 21 +- + net/ipv4/tcp_veno.c | 24 +- + net/ipv4/tcp_westwood.c | 3 +- + net/ipv4/tcp_yeah.c | 30 +- + net/ipv4/udp.c | 13 +- + net/ipv4/udp_bpf.c | 17 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv6/addrconf.c | 43 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/datagram.c | 4 +- + net/ipv6/exthdrs.c | 44 +- + net/ipv6/icmp.c | 31 +- + net/ipv6/ip6_gre.c | 34 +- + net/ipv6/ip6_input.c | 41 +- + net/ipv6/ip6_output.c | 34 +- + net/ipv6/ip6_tunnel.c | 2 - + net/ipv6/ndisc.c | 20 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 4 + + net/ipv6/raw.c | 6 +- + net/ipv6/route.c | 6 +- + net/ipv6/tcp_ipv6.c | 5 +- + net/ipv6/udp.c | 10 +- + net/ipv6/udp_impl.h | 4 +- + net/iucv/af_iucv.c | 3 +- + net/key/af_key.c | 4 +- + net/l2tp/l2tp_ip.c | 4 +- + net/l2tp/l2tp_ip6.c | 4 +- + net/l2tp/l2tp_ppp.c | 3 +- + net/mac802154/cfg.c | 1 + + net/mac802154/ieee802154_i.h | 2 + + net/mac802154/main.c | 54 +- + net/mac802154/util.c | 22 +- + net/mctp/af_mctp.c | 4 +- + net/mctp/test/route-test.c | 8 +- + net/mpls/af_mpls.c | 3 +- + net/mptcp/ctrl.c | 21 + + net/mptcp/mib.c | 1 + + net/mptcp/mib.h | 1 + + net/mptcp/mptcp_diag.c | 105 +- + net/mptcp/options.c | 8 +- + net/mptcp/pm.c | 91 +- + net/mptcp/pm_netlink.c | 73 +- + net/mptcp/protocol.c | 107 +- + net/mptcp/protocol.h | 32 +- + net/mptcp/sockopt.c | 6 - + net/mptcp/subflow.c | 70 +- + net/netfilter/nf_conntrack_bpf.c | 22 +- + net/netfilter/nf_conntrack_ecache.c | 19 +- + net/netfilter/nf_conntrack_netlink.c | 68 +- + net/netfilter/nf_log_syslog.c | 136 +- + net/netfilter/nf_tables_api.c | 6 +- + net/netfilter/nfnetlink_cttimeout.c | 14 +- + net/netfilter/nft_bitwise.c | 13 +- + net/netfilter/nft_fib.c | 4 + + net/netlink/af_netlink.c | 3 +- + net/netrom/af_netrom.c | 3 +- + net/nfc/core.c | 1 + + net/nfc/llcp_sock.c | 3 +- + net/nfc/rawsock.c | 3 +- + net/packet/af_packet.c | 22 +- + net/phonet/datagram.c | 4 +- + net/phonet/pep.c | 7 +- + net/qrtr/af_qrtr.c | 3 +- + net/rose/af_rose.c | 3 +- + net/sched/act_api.c | 4 +- + net/sched/act_csum.c | 3 +- + net/sched/act_ct.c | 3 +- + net/sched/act_gact.c | 13 +- + net/sched/act_gate.c | 3 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_mpls.c | 10 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 20 +- + net/sched/act_sample.c | 3 +- + net/sched/act_skbedit.c | 65 +- + net/sched/act_tunnel_key.c | 4 +- + net/sched/act_vlan.c | 4 +- + net/sched/cls_api.c | 22 +- + net/sched/cls_flower.c | 104 +- + net/sched/cls_matchall.c | 19 +- + net/sched/sch_generic.c | 12 +- + net/sctp/ipv6.c | 4 +- + net/sctp/socket.c | 18 +- + net/sctp/ulpevent.c | 2 +- + net/socket.c | 15 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/tls/tls_device.c | 6 +- + net/tls/tls_sw.c | 489 ++-- + net/unix/af_unix.c | 11 +- + net/unix/unix_bpf.c | 5 +- + net/vmw_vsock/virtio_transport.c | 197 +- + net/vmw_vsock/vmci_transport.c | 5 +- + net/x25/af_x25.c | 3 +- + net/xdp/xsk.c | 4 +- + net/xdp/xsk_queue.h | 4 +- + net/xdp/xskmap.c | 6 +- + net/xfrm/espintcp.c | 4 +- + samples/bpf/Makefile | 10 +- + samples/bpf/cpustat_user.c | 1 - + samples/bpf/hbm.c | 5 +- + samples/bpf/ibumad_user.c | 1 - + samples/bpf/map_perf_test_user.c | 1 - + samples/bpf/offwaketime_user.c | 1 - + samples/bpf/sockex2_user.c | 1 - + samples/bpf/sockex3_user.c | 1 - + samples/bpf/spintest_user.c | 1 - + samples/bpf/syscall_tp_user.c | 4 +- + samples/bpf/task_fd_query_user.c | 1 - + samples/bpf/test_lru_dist.c | 1 - + samples/bpf/test_map_in_map_user.c | 1 - + samples/bpf/test_overhead_user.c | 1 - + samples/bpf/tracex2_user.c | 1 - + samples/bpf/tracex3_user.c | 1 - + samples/bpf/tracex4_user.c | 1 - + samples/bpf/tracex5_user.c | 1 - + samples/bpf/tracex6_user.c | 1 - + samples/bpf/xdp1_user.c | 3 +- + samples/bpf/xdp_adjust_tail_user.c | 1 - + samples/bpf/xdp_monitor_user.c | 1 - + samples/bpf/xdp_redirect_cpu_user.c | 1 - + samples/bpf/xdp_redirect_map_multi_user.c | 1 - + samples/bpf/xdp_redirect_user.c | 1 - + samples/bpf/xdp_router_ipv4.bpf.c | 180 ++ + samples/bpf/xdp_router_ipv4_kern.c | 186 -- + samples/bpf/xdp_router_ipv4_user.c | 456 ++-- + samples/bpf/xdp_rxq_info_user.c | 1 - + samples/bpf/xdp_sample_pkts_user.c | 1 - + samples/bpf/xdp_sample_user.c | 1 - + samples/bpf/xdp_tx_iptunnel_user.c | 1 - + samples/bpf/xdpsock_user.c | 9 +- + samples/bpf/xsk_fwd.c | 7 +- + tools/bpf/bpftool/common.c | 8 - + tools/bpf/bpftool/feature.c | 4 +- + tools/bpf/bpftool/link.c | 3 + + tools/bpf/bpftool/main.c | 6 +- + tools/bpf/bpftool/main.h | 2 - + tools/bpf/bpftool/map.c | 2 - + tools/bpf/bpftool/perf.c | 112 +- + tools/bpf/bpftool/pids.c | 1 - + tools/bpf/bpftool/prog.c | 4 +- + tools/bpf/bpftool/struct_ops.c | 2 - + tools/bpf/bpftool/tracelog.c | 2 +- + tools/bpf/runqslower/runqslower.c | 18 +- + tools/include/uapi/asm-generic/socket.h | 2 + + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/include/uapi/linux/bpf.h | 12 + + tools/include/uapi/linux/btf.h | 4 +- + tools/lib/bpf/Build | 3 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 34 +- + tools/lib/bpf/bpf_helpers.h | 7 + + tools/lib/bpf/bpf_tracing.h | 23 + + tools/lib/bpf/btf.c | 15 +- + tools/lib/bpf/libbpf.c | 808 +++++- + tools/lib/bpf/libbpf.h | 123 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 37 + + tools/lib/bpf/relo_core.c | 104 +- + tools/lib/bpf/relo_core.h | 6 + + tools/lib/bpf/usdt.bpf.h | 259 ++ + tools/lib/bpf/usdt.c | 1518 +++++++++++ + tools/testing/selftests/bpf/Makefile | 25 +- + tools/testing/selftests/bpf/bench.c | 1 - + tools/testing/selftests/bpf/bpf_rlimit.h | 28 - + tools/testing/selftests/bpf/flow_dissector_load.c | 6 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 4 +- + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 107 + + .../selftests/bpf/prog_tests/attach_probe.c | 85 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 4 +- + .../selftests/bpf/prog_tests/bpf_mod_race.c | 4 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 100 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 2 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 12 + + .../selftests/bpf/prog_tests/helper_restricted.c | 10 +- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 17 +- + .../selftests/bpf/prog_tests/linked_funcs.c | 6 + + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 114 + + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 37 + + tools/testing/selftests/bpf/prog_tests/netcnt.c | 2 +- + .../bpf/prog_tests/prog_tests_framework.c | 56 + + .../selftests/bpf/prog_tests/reference_tracking.c | 23 +- + .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 + + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 1 - + .../selftests/bpf/prog_tests/test_global_funcs.c | 1 + + .../selftests/bpf/prog_tests/test_strncmp.c | 25 +- + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 50 + + tools/testing/selftests/bpf/prog_tests/usdt.c | 421 +++ + tools/testing/selftests/bpf/progs/exhandler_kern.c | 15 +- + .../bpf/progs/for_each_map_elem_write_key.c | 27 + + tools/testing/selftests/bpf/progs/linked_funcs1.c | 15 +- + tools/testing/selftests/bpf/progs/linked_funcs2.c | 15 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 190 ++ + .../selftests/bpf/progs/perf_event_stackmap.c | 4 +- + tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +- + tools/testing/selftests/bpf/progs/pyperf.h | 4 + + tools/testing/selftests/bpf/progs/pyperf600.c | 11 +- + tools/testing/selftests/bpf/progs/skb_load_bytes.c | 19 + + tools/testing/selftests/bpf/progs/strncmp_test.c | 8 +- + .../selftests/bpf/progs/test_attach_probe.c | 41 +- + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +- + .../selftests/bpf/progs/test_global_func17.c | 16 + + .../selftests/bpf/progs/test_helper_restricted.c | 16 +- + .../bpf/progs/test_ksyms_btf_write_check.c | 18 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/test_log_fixup.c | 38 + + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + .../selftests/bpf/progs/test_sk_lookup_kern.c | 18 +- + .../selftests/bpf/progs/test_task_pt_regs.c | 2 +- + .../selftests/bpf/progs/test_uprobe_autoattach.c | 73 + + .../selftests/bpf/progs/test_urandom_usdt.c | 70 + + tools/testing/selftests/bpf/progs/test_usdt.c | 96 + + .../selftests/bpf/progs/test_usdt_multispec.c | 32 + + .../selftests/bpf/progs/test_xdp_noinline.c | 12 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 2 +- + tools/testing/selftests/bpf/sdt-config.h | 6 + + tools/testing/selftests/bpf/sdt.h | 513 ++++ + .../selftests/bpf/test_bpftool_synctypes.py | 2 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 7 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 4 +- + tools/testing/selftests/bpf/test_lpm_map.c | 43 +- + tools/testing/selftests/bpf/test_lru_map.c | 70 +- + tools/testing/selftests/bpf/test_offload.py | 2 +- + tools/testing/selftests/bpf/test_progs.c | 487 ++-- + tools/testing/selftests/bpf/test_progs.h | 64 +- + .../selftests/bpf/test_skb_cgroup_id_user.c | 4 +- + tools/testing/selftests/bpf/test_sock.c | 6 +- + tools/testing/selftests/bpf/test_sock_addr.c | 4 +- + tools/testing/selftests/bpf/test_sockmap.c | 5 +- + tools/testing/selftests/bpf/test_sysctl.c | 6 +- + tools/testing/selftests/bpf/test_tag.c | 4 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 4 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 1 - + tools/testing/selftests/bpf/test_verifier.c | 55 +- + tools/testing/selftests/bpf/test_verifier_log.c | 5 +- + tools/testing/selftests/bpf/testing_helpers.c | 91 +- + tools/testing/selftests/bpf/testing_helpers.h | 8 + + tools/testing/selftests/bpf/trace_helpers.c | 9 +- + tools/testing/selftests/bpf/urandom_read.c | 63 +- + tools/testing/selftests/bpf/urandom_read_aux.c | 9 + + tools/testing/selftests/bpf/urandom_read_lib1.c | 13 + + tools/testing/selftests/bpf/urandom_read_lib2.c | 8 + + tools/testing/selftests/bpf/verifier/calls.c | 20 + + tools/testing/selftests/bpf/verifier/map_kptr.c | 469 ++++ + .../testing/selftests/bpf/verifier/ref_tracking.c | 2 +- + tools/testing/selftests/bpf/verifier/sock.c | 6 +- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 1 - + tools/testing/selftests/bpf/xdping.c | 8 +- + tools/testing/selftests/bpf/xdpxceiver.c | 6 +- + .../drivers/net/dsa/bridge_locked_port.sh | 1 + + .../selftests/drivers/net/dsa/bridge_mdb.sh | 1 + + .../selftests/drivers/net/dsa/bridge_mld.sh | 1 + + .../selftests/drivers/net/dsa/bridge_vlan_aware.sh | 1 + + .../selftests/drivers/net/dsa/bridge_vlan_mcast.sh | 1 + + .../drivers/net/dsa/bridge_vlan_unaware.sh | 1 + + .../selftests/drivers/net/dsa/forwarding.config | 2 + + tools/testing/selftests/drivers/net/dsa/lib.sh | 1 + + .../selftests/drivers/net/dsa/local_termination.sh | 1 + + .../selftests/drivers/net/dsa/no_forwarding.sh | 1 + + .../drivers/net/mlxsw/devlink_linecard.sh | 341 +++ + tools/testing/selftests/drivers/net/ocelot/psfp.sh | 327 +++ + .../drivers/net/ocelot/tc_flower_chains.sh | 24 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fib_rule_tests.sh | 12 +- + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../testing/selftests/net/forwarding/bridge_mdb.sh | 103 + + tools/testing/selftests/net/forwarding/lib.sh | 112 +- + .../selftests/net/forwarding/local_termination.sh | 299 ++ + .../selftests/net/forwarding/no_forwarding.sh | 261 ++ + tools/testing/selftests/net/forwarding/tsn_lib.sh | 235 ++ + tools/testing/selftests/net/mptcp/config | 8 + + tools/testing/selftests/net/mptcp/diag.sh | 38 + + tools/testing/selftests/net/mptcp/mptcp_join.sh | 221 +- + .../selftests/net/ndisc_unsolicited_na_test.sh | 255 ++ + .../testing/selftests/net/vrf_strict_mode_test.sh | 48 +- + tools/testing/selftests/netfilter/nft_fib.sh | 50 + + 823 files changed, 37895 insertions(+), 29885 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml + create mode 100644 Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml + create mode 100644 Documentation/devicetree/bindings/net/mediatek,net.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mediatek-net.txt + create mode 100644 Documentation/devicetree/bindings/net/mscc,miim.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mscc-miim.txt + create mode 100644 Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst + create mode 100644 Documentation/networking/device_drivers/can/ctu/fsm_txt_buffer_user.svg + create mode 100644 Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst + delete mode 100644 Documentation/networking/device_drivers/wan/index.rst + delete mode 100644 Documentation/networking/device_drivers/wan/z8530book.rst + create mode 100644 Documentation/networking/devlink/devlink-linecard.rst + delete mode 100644 drivers/atm/ambassador.c + delete mode 100644 drivers/atm/ambassador.h + delete mode 100644 drivers/atm/firestream.c + delete mode 100644 drivers/atm/firestream.h + delete mode 100644 drivers/atm/horizon.c + delete mode 100644 drivers/atm/horizon.h + delete mode 100644 drivers/atm/uPD98401.h + delete mode 100644 drivers/atm/uPD98402.c + delete mode 100644 drivers/atm/uPD98402.h + delete mode 100644 drivers/atm/zatm.c + delete mode 100644 drivers/atm/zatm.h + create mode 100644 drivers/net/can/ctucanfd/Kconfig + create mode 100644 drivers/net/can/ctucanfd/Makefile + create mode 100644 drivers/net/can/ctucanfd/ctucanfd.h + create mode 100644 drivers/net/can/ctucanfd/ctucanfd_base.c + create mode 100644 drivers/net/can/ctucanfd/ctucanfd_kframe.h + create mode 100644 drivers/net/can/ctucanfd/ctucanfd_kregs.h + create mode 100644 drivers/net/can/ctucanfd/ctucanfd_pci.c + create mode 100644 drivers/net/can/ctucanfd/ctucanfd_platform.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Kconfig + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Makefile + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_config.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_debugfs.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_ops.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_linecards.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c + delete mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c + create mode 100644 drivers/net/ethernet/sfc/ef100_sriov.c + create mode 100644 drivers/net/ethernet/sfc/ef100_sriov.h + delete mode 100644 drivers/net/hamradio/dmascc.c + create mode 100644 drivers/net/phy/adin1100.c + delete mode 100644 drivers/net/wan/cosa.c + delete mode 100644 drivers/net/wan/cosa.h + delete mode 100644 drivers/net/wan/hostess_sv11.c + delete mode 100644 drivers/net/wan/lmc/Makefile + delete mode 100644 drivers/net/wan/lmc/lmc.h + delete mode 100644 drivers/net/wan/lmc/lmc_debug.c + delete mode 100644 drivers/net/wan/lmc/lmc_debug.h + delete mode 100644 drivers/net/wan/lmc/lmc_ioctl.h + delete mode 100644 drivers/net/wan/lmc/lmc_main.c + delete mode 100644 drivers/net/wan/lmc/lmc_media.c + delete mode 100644 drivers/net/wan/lmc/lmc_proto.c + delete mode 100644 drivers/net/wan/lmc/lmc_proto.h + delete mode 100644 drivers/net/wan/lmc/lmc_var.h + delete mode 100644 drivers/net/wan/sealevel.c + delete mode 100644 drivers/net/wan/z85230.c + delete mode 100644 drivers/net/wan/z85230.h + delete mode 100644 include/linux/qed/qed_nvmetcp_ip_services_if.h + create mode 100644 include/linux/soc/mediatek/mtk_wed.h + delete mode 100644 include/uapi/linux/atm_zatm.h + delete mode 100644 net/core/datagram.h + create mode 100644 net/core/dev.h + create mode 100644 samples/bpf/xdp_router_ipv4.bpf.c + delete mode 100644 samples/bpf/xdp_router_ipv4_kern.c + create mode 100644 tools/lib/bpf/usdt.bpf.h + create mode 100644 tools/lib/bpf/usdt.c + delete mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/arg_parsing.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/log_fixup.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_kptr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c + create mode 100644 tools/testing/selftests/bpf/progs/map_kptr.c + create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_func17.c + create mode 100644 tools/testing/selftests/bpf/progs/test_log_fixup.c + create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_urandom_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt_multispec.c + create mode 100644 tools/testing/selftests/bpf/sdt-config.h + create mode 100644 tools/testing/selftests/bpf/sdt.h + create mode 100644 tools/testing/selftests/bpf/urandom_read_aux.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib1.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib2.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_kptr.c + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_locked_port.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_mdb.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_mld.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_aware.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_mcast.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_unaware.sh + create mode 100644 tools/testing/selftests/drivers/net/dsa/forwarding.config + create mode 120000 tools/testing/selftests/drivers/net/dsa/lib.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/local_termination.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/no_forwarding.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh + create mode 100755 tools/testing/selftests/drivers/net/ocelot/psfp.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_mdb.sh + mode change 100644 => 100755 tools/testing/selftests/net/forwarding/lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/local_termination.sh + create mode 100755 tools/testing/selftests/net/forwarding/no_forwarding.sh + create mode 100644 tools/testing/selftests/net/forwarding/tsn_lib.sh + create mode 100755 tools/testing/selftests/net/ndisc_unsolicited_na_test.sh +Merging bpf-next/for-next (20b87e7c29df selftests/bpf: Fix two memory leaks in prog_tests) +$ 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 +Merge made by the 'ort' strategy. + Documentation/bpf/instruction-set.rst | 4 +- + net/core/skmsg.c | 22 +- + samples/bpf/xdp_rxq_info_user.c | 22 +- + tools/lib/bpf/libbpf.c | 287 +++++++--- + tools/lib/bpf/libbpf.h | 22 + + tools/lib/bpf/libbpf.map | 4 +- + .../selftests/bpf/prog_tests/attach_probe.c | 10 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 14 +- + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 37 +- + tools/testing/selftests/bpf/progs/kprobe_multi.c | 14 + + .../selftests/bpf/progs/test_attach_probe.c | 23 +- + tools/testing/selftests/bpf/progs/test_log_fixup.c | 26 + + .../selftests/bpf/progs/test_module_attach.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 637 +++++++++++++++------ + tools/testing/selftests/bpf/test_progs.h | 35 +- + 15 files changed, 868 insertions(+), 291 deletions(-) +Merging ipsec-next/master (6e28f56c0d1d Merge branch 'adin1100-industrial-PHY-support') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (2984287c4c19 net/mlx5: Remove not-implemented IPsec capabilities) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (a99a4899aae6 Bluetooth: btusb: Add a new PID/VID 0489/e0c8 for MT7921) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btbcm.c | 52 +++++++++++++++++++++++++++++++++++++++- + drivers/bluetooth/btintel.c | 2 +- + drivers/bluetooth/btmtksdio.c | 2 +- + drivers/bluetooth/btrtl.c | 13 ++++++++++ + drivers/bluetooth/btusb.c | 23 ++++++++++++++++-- + drivers/bluetooth/hci_qca.c | 4 ++-- + include/net/bluetooth/hci.h | 9 +++++++ + include/net/bluetooth/hci_core.h | 8 +++++-- + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_core.c | 2 -- + net/bluetooth/hci_event.c | 27 ++++++++++++++++----- + net/bluetooth/hci_request.c | 2 ++ + net/bluetooth/hci_sync.c | 32 +++++++++++++++++++++++++ + net/bluetooth/mgmt_util.c | 2 +- + net/bluetooth/sco.c | 23 +++++++++++------- + 15 files changed, 175 insertions(+), 28 deletions(-) +Merging wireless-next/main (0d3b26c4b97a rtw88: remove a copy of the NAPI_POLL_WEIGHT define) +$ 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 Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ar5523/ar5523.c +Auto-merging drivers/net/wireless/ath/ath11k/core.c +Auto-merging drivers/net/wireless/ath/ath11k/core.h +Auto-merging drivers/net/wireless/ath/ath11k/mac.c +Auto-merging drivers/net/wireless/ath/ath11k/mac.h +Auto-merging drivers/net/wireless/ath/ath11k/reg.c +Auto-merging drivers/net/wireless/ath/ath11k/wmi.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c +Auto-merging drivers/net/wireless/ti/wlcore/sdio.c +Auto-merging net/mac80211/debugfs_sta.c +Auto-merging net/wireless/nl80211.c +Merge made by the 'ort' strategy. + .../{staging => }/net/wireless/silabs,wfx.yaml | 2 +- + MAINTAINERS | 10 +- + drivers/net/wireless/Kconfig | 2 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/ar5523/ar5523.c | 4 +- + drivers/net/wireless/ath/ath10k/ahb.c | 9 +- + drivers/net/wireless/ath/ath10k/core.c | 25 + + drivers/net/wireless/ath/ath10k/hw.h | 2 + + drivers/net/wireless/ath/ath10k/mac.c | 76 +- + drivers/net/wireless/ath/ath10k/usb.c | 27 + + drivers/net/wireless/ath/ath11k/Makefile | 6 +- + drivers/net/wireless/ath/ath11k/core.c | 371 +- + drivers/net/wireless/ath/ath11k/core.h | 119 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 + + drivers/net/wireless/ath/ath11k/htc.c | 6 + + drivers/net/wireless/ath/ath11k/hw.h | 23 +- + drivers/net/wireless/ath/ath11k/mac.c | 476 +- + drivers/net/wireless/ath/ath11k/mac.h | 1 + + drivers/net/wireless/ath/ath11k/mhi.c | 285 +- + drivers/net/wireless/ath/ath11k/mhi.h | 17 +- + drivers/net/wireless/ath/ath11k/pci.c | 982 +- + drivers/net/wireless/ath/ath11k/pci.h | 28 +- + drivers/net/wireless/ath/ath11k/pcic.c | 741 + + drivers/net/wireless/ath/ath11k/pcic.h | 46 + + drivers/net/wireless/ath/ath11k/peer.c | 373 +- + drivers/net/wireless/ath/ath11k/peer.h | 10 +- + drivers/net/wireless/ath/ath11k/qmi.c | 19 +- + drivers/net/wireless/ath/ath11k/reg.c | 1 + + drivers/net/wireless/ath/ath11k/wmi.c | 619 + + drivers/net/wireless/ath/ath11k/wmi.h | 366 +- + drivers/net/wireless/ath/ath11k/wow.c | 763 + + drivers/net/wireless/ath/ath11k/wow.h | 45 + + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 2 +- + drivers/net/wireless/ath/ath9k/ahb.c | 8 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 85 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 + + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 25 +- + drivers/net/wireless/ath/ath9k/debug_sta.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 +- + drivers/net/wireless/ath/ath9k/mac.h | 6 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 10 +- + drivers/net/wireless/ath/ath9k/xmit.c | 6 +- + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/carl9170/tx.c | 5 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 7 +- + drivers/net/wireless/ath/wcn36xx/main.c | 160 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 92 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 + + drivers/net/wireless/ath/wcn36xx/txrx.c | 29 + + drivers/net/wireless/ath/wcn36xx/txrx.h | 1 + + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/phy.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 39 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 1 + + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 64 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 119 +- + drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 6 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/common.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mei/sap.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 6 +- + drivers/net/wireless/intersil/orinoco/airport.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 4 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 2 + + drivers/net/wireless/marvell/mwifiex/sdio.c | 23 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 6 + + drivers/net/wireless/marvell/mwl8k.c | 48 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 16 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 83 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 140 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/tx.c | 4 +- + drivers/net/wireless/purelifi/Kconfig | 17 + + drivers/net/wireless/purelifi/Makefile | 2 + + drivers/net/wireless/purelifi/plfxlc/Kconfig | 14 + + drivers/net/wireless/purelifi/plfxlc/Makefile | 3 + + drivers/net/wireless/purelifi/plfxlc/chip.c | 99 + + drivers/net/wireless/purelifi/plfxlc/chip.h | 70 + + drivers/net/wireless/purelifi/plfxlc/firmware.c | 276 + + drivers/net/wireless/purelifi/plfxlc/intf.h | 52 + + drivers/net/wireless/purelifi/plfxlc/mac.c | 754 + + drivers/net/wireless/purelifi/plfxlc/mac.h | 184 + + drivers/net/wireless/purelifi/plfxlc/usb.c | 891 + + drivers/net/wireless/purelifi/plfxlc/usb.h | 198 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 8 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 146 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 44 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 16 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 40 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 15 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 6 +- + drivers/net/wireless/realtek/rtw88/bf.c | 2 +- + drivers/net/wireless/realtek/rtw88/fw.c | 29 +- + drivers/net/wireless/realtek/rtw88/fw.h | 4 +- + drivers/net/wireless/realtek/rtw88/mac.c | 2 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 44 +- + drivers/net/wireless/realtek/rtw88/main.c | 73 +- + drivers/net/wireless/realtek/rtw88/main.h | 8 +- + drivers/net/wireless/realtek/rtw88/pci.c | 19 +- + drivers/net/wireless/realtek/rtw88/phy.c | 2 +- + drivers/net/wireless/realtek/rtw88/reg.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 5 + + .../net/wireless/realtek/rtw88/rtw8821c_table.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 4 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + + drivers/net/wireless/realtek/rtw88/rx.c | 3 +- + drivers/net/wireless/realtek/rtw88/tx.c | 31 +- + drivers/net/wireless/realtek/rtw88/tx.h | 4 + + drivers/net/wireless/realtek/rtw89/cam.c | 57 +- + drivers/net/wireless/realtek/rtw89/cam.h | 4 + + drivers/net/wireless/realtek/rtw89/coex.c | 24 +- + drivers/net/wireless/realtek/rtw89/core.c | 182 +- + drivers/net/wireless/realtek/rtw89/core.h | 262 +- + drivers/net/wireless/realtek/rtw89/debug.c | 70 +- + drivers/net/wireless/realtek/rtw89/fw.c | 299 +- + drivers/net/wireless/realtek/rtw89/fw.h | 388 +- + drivers/net/wireless/realtek/rtw89/mac.c | 713 +- + drivers/net/wireless/realtek/rtw89/mac.h | 81 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw89/pci.c | 957 +- + drivers/net/wireless/realtek/rtw89/pci.h | 389 + + drivers/net/wireless/realtek/rtw89/phy.c | 451 +- + drivers/net/wireless/realtek/rtw89/phy.h | 73 +- + drivers/net/wireless/realtek/rtw89/ps.c | 34 +- + drivers/net/wireless/realtek/rtw89/reg.h | 1684 +- + drivers/net/wireless/realtek/rtw89/regd.c | 513 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 81 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 8 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 605 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 40 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2276 ++- + drivers/net/wireless/realtek/rtw89/rtw8852c.h | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 214 + + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 14 + + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 19470 +++++++++++++++++++ + .../net/wireless/realtek/rtw89/rtw8852c_table.h | 36 + + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 48 + + drivers/net/wireless/realtek/rtw89/ser.c | 250 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 107 + + drivers/net/wireless/realtek/rtw89/util.h | 30 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 12 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +- + drivers/net/wireless/silabs/Kconfig | 18 + + drivers/net/wireless/silabs/Makefile | 3 + + .../{staging => net/wireless/silabs}/wfx/Kconfig | 0 + .../{staging => net/wireless/silabs}/wfx/Makefile | 0 + drivers/{staging => net/wireless/silabs}/wfx/bh.c | 0 + drivers/{staging => net/wireless/silabs}/wfx/bh.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/bus.h | 0 + .../wireless/silabs}/wfx/bus_sdio.c | 0 + .../{staging => net/wireless/silabs}/wfx/bus_spi.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_rx.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_rx.h | 0 + .../{staging => net/wireless/silabs}/wfx/data_tx.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_tx.h | 0 + .../{staging => net/wireless/silabs}/wfx/debug.c | 0 + .../{staging => net/wireless/silabs}/wfx/debug.h | 0 + .../{staging => net/wireless/silabs}/wfx/fwio.c | 0 + .../{staging => net/wireless/silabs}/wfx/fwio.h | 0 + .../wireless/silabs}/wfx/hif_api_cmd.h | 0 + .../wireless/silabs}/wfx/hif_api_general.h | 0 + .../wireless/silabs}/wfx/hif_api_mib.h | 0 + .../{staging => net/wireless/silabs}/wfx/hif_rx.c | 0 + .../{staging => net/wireless/silabs}/wfx/hif_rx.h | 0 + .../{staging => net/wireless/silabs}/wfx/hif_tx.c | 0 + .../{staging => net/wireless/silabs}/wfx/hif_tx.h | 0 + .../wireless/silabs}/wfx/hif_tx_mib.c | 0 + .../wireless/silabs}/wfx/hif_tx_mib.h | 0 + .../{staging => net/wireless/silabs}/wfx/hwio.c | 0 + .../{staging => net/wireless/silabs}/wfx/hwio.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/key.c | 0 + drivers/{staging => net/wireless/silabs}/wfx/key.h | 0 + .../{staging => net/wireless/silabs}/wfx/main.c | 0 + .../{staging => net/wireless/silabs}/wfx/main.h | 0 + .../{staging => net/wireless/silabs}/wfx/queue.c | 0 + .../{staging => net/wireless/silabs}/wfx/queue.h | 0 + .../{staging => net/wireless/silabs}/wfx/scan.c | 0 + .../{staging => net/wireless/silabs}/wfx/scan.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/sta.c | 8 +- + drivers/{staging => net/wireless/silabs}/wfx/sta.h | 0 + .../{staging => net/wireless/silabs}/wfx/traces.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/wfx.h | 0 + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/ti/wl18xx/debugfs.c | 18 +- + drivers/net/wireless/ti/wlcore/cmd.c | 14 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 52 +- + drivers/net/wireless/ti/wlcore/main.c | 241 +- + drivers/net/wireless/ti/wlcore/scan.c | 6 +- + drivers/net/wireless/ti/wlcore/sdio.c | 3 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 6 +- + drivers/net/wireless/ti/wlcore/testmode.c | 12 +- + drivers/net/wireless/ti/wlcore/tx.c | 6 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 18 +- + drivers/staging/Kconfig | 1 - + drivers/staging/Makefile | 1 - + drivers/staging/wfx/TODO | 6 - + include/net/mac80211.h | 90 +- + net/mac80211/agg-rx.c | 12 +- + net/mac80211/agg-tx.c | 6 +- + net/mac80211/airtime.c | 4 +- + net/mac80211/cfg.c | 33 +- + net/mac80211/chan.c | 8 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_sta.c | 12 +- + net/mac80211/eht.c | 6 +- + net/mac80211/ethtool.c | 4 +- + net/mac80211/he.c | 8 +- + net/mac80211/ht.c | 8 +- + net/mac80211/ibss.c | 26 +- + net/mac80211/key.c | 9 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_plink.c | 24 +- + net/mac80211/mlme.c | 18 +- + net/mac80211/ocb.c | 2 +- + net/mac80211/rate.c | 8 +- + net/mac80211/rc80211_minstrel_ht.c | 23 +- + net/mac80211/rx.c | 131 +- + net/mac80211/s1g.c | 4 +- + net/mac80211/sta_info.c | 110 +- + net/mac80211/sta_info.h | 155 +- + net/mac80211/status.c | 41 +- + net/mac80211/tdls.c | 26 +- + net/mac80211/trace.h | 4 +- + net/mac80211/tx.c | 26 +- + net/mac80211/vht.c | 78 +- + net/wireless/nl80211.c | 1 + + 276 files changed, 37129 insertions(+), 3722 deletions(-) + rename Documentation/devicetree/bindings/{staging => }/net/wireless/silabs,wfx.yaml (98%) + create mode 100644 drivers/net/wireless/ath/ath11k/pcic.c + create mode 100644 drivers/net/wireless/ath/ath11k/pcic.h + create mode 100644 drivers/net/wireless/purelifi/Kconfig + create mode 100644 drivers/net/wireless/purelifi/Makefile + create mode 100644 drivers/net/wireless/purelifi/plfxlc/Kconfig + create mode 100644 drivers/net/wireless/purelifi/plfxlc/Makefile + create mode 100644 drivers/net/wireless/purelifi/plfxlc/chip.c + create mode 100644 drivers/net/wireless/purelifi/plfxlc/chip.h + create mode 100644 drivers/net/wireless/purelifi/plfxlc/firmware.c + create mode 100644 drivers/net/wireless/purelifi/plfxlc/intf.h + create mode 100644 drivers/net/wireless/purelifi/plfxlc/mac.c + create mode 100644 drivers/net/wireless/purelifi/plfxlc/mac.h + create mode 100644 drivers/net/wireless/purelifi/plfxlc/usb.c + create mode 100644 drivers/net/wireless/purelifi/plfxlc/usb.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_table.h + create mode 100644 drivers/net/wireless/silabs/Kconfig + create mode 100644 drivers/net/wireless/silabs/Makefile + rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/key.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/main.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (99%) + rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (100%) + delete mode 100644 drivers/staging/wfx/TODO +Merging mtd/mtd/next (43823c5c56f2 mtd: cfi_cmdset_0002: Rename chip_ready variables) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 8 - + .../devicetree/bindings/reserved-memory/phram.yaml | 47 ++++ + drivers/mtd/chips/cfi_cmdset_0002.c | 112 +++++---- + drivers/mtd/devices/phram.c | 67 +++++- + drivers/mtd/maps/Kconfig | 9 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/ixp4xx.c | 262 --------------------- + drivers/mtd/mtdblock.c | 8 +- + drivers/mtd/mtdcore.c | 11 +- + drivers/mtd/mtdoops.c | 61 +++-- + drivers/mtd/parsers/bcm47xxpart.c | 2 +- + drivers/of/platform.c | 1 + + include/linux/mtd/cfi.h | 1 + + 13 files changed, 216 insertions(+), 374 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reserved-memory/phram.yaml + delete mode 100644 drivers/mtd/maps/ixp4xx.c +Merging nand/nand/next (079d6348f3be Merge tag 'mtd/mtk-spi-nand-for-5.19' into nand/next) +$ 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/ecc-mtk.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mtd/elm.txt | 16 -- + Documentation/devicetree/bindings/mtd/ti,elm.yaml | 72 +++++ + drivers/mtd/nand/Kconfig | 7 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/{raw/mtk_ecc.c => ecc-mtk.c} | 8 +- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/Makefile | 2 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 5 +- + drivers/mtd/nand/raw/davinci_nand.c | 2 +- + drivers/mtd/nand/raw/denali_pci.c | 15 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 296 ++++++++++++++++++--- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 12 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 2 +- + drivers/mtd/nand/raw/mtk_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 9 +- + drivers/mtd/nand/raw/nand_ids.c | 3 + + drivers/mtd/nand/raw/omap_elm.c | 1 + + drivers/mtd/nand/raw/tmio_nand.c | 3 + + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/gigadevice.c | 158 ++++++++++- + drivers/mtd/nand/spi/xtx.c | 129 +++++++++ + .../mtk_ecc.h => include/linux/mtd/nand-ecc-mtk.h | 0 + include/linux/mtd/spinand.h | 1 + + 24 files changed, 661 insertions(+), 87 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/elm.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,elm.yaml + rename drivers/mtd/nand/{raw/mtk_ecc.c => ecc-mtk.c} (98%) + create mode 100644 drivers/mtd/nand/spi/xtx.c + rename drivers/mtd/nand/raw/mtk_ecc.h => include/linux/mtd/nand-ecc-mtk.h (100%) +Merging spi-nor/spi-nor/next (5ad784d990ac mtd: spi-nor: amend the rdsr dummy cycles documentation) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/core.c | 254 ++++++++++++++++++++-------------------- + drivers/mtd/spi-nor/core.h | 120 ++++++++++++++++++- + drivers/mtd/spi-nor/micron-st.c | 139 +++++++++++----------- + drivers/mtd/spi-nor/spansion.c | 159 +++++++++++++------------ + drivers/mtd/spi-nor/xilinx.c | 12 +- + 5 files changed, 409 insertions(+), 275 deletions(-) +Merging crypto/master (11aeb93089ce hwrng: optee - remove redundant initialization to variable rng_size) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 14 + + Documentation/ABI/testing/debugfs-hisi-sec | 14 + + Documentation/ABI/testing/debugfs-hisi-zip | 14 + + Documentation/ABI/testing/sysfs-driver-ccp | 87 +++ + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 1 + + arch/arm64/crypto/Kconfig | 16 +- + arch/arm64/crypto/Makefile | 8 +- + arch/arm64/crypto/sm4-ce-cipher-core.S | 36 ++ + arch/arm64/crypto/sm4-ce-cipher-glue.c | 82 +++ + arch/arm64/crypto/sm4-ce-core.S | 688 ++++++++++++++++++++- + arch/arm64/crypto/sm4-ce-glue.c | 386 ++++++++++-- + arch/arm64/crypto/sm4-neon-core.S | 487 +++++++++++++++ + arch/arm64/crypto/sm4-neon-glue.c | 442 +++++++++++++ + arch/x86/crypto/blowfish_glue.c | 8 +- + arch/x86/crypto/camellia_glue.c | 8 +- + arch/x86/crypto/serpent_avx2_glue.c | 8 +- + arch/x86/crypto/twofish_glue.c | 8 +- + arch/x86/crypto/twofish_glue_3way.c | 8 +- + crypto/Kconfig | 18 +- + crypto/Makefile | 6 +- + crypto/crypto_engine.c | 1 + + crypto/ecrdsa.c | 8 +- + {lib/crypto => crypto}/sm3.c | 0 + {lib/crypto => crypto}/sm4.c | 10 +- + crypto/testmgr.c | 75 ++- + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/cn10k-rng.c | 31 +- + drivers/char/hw_random/mpfs-rng.c | 104 ++++ + drivers/char/hw_random/optee-rng.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 6 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 6 +- + drivers/crypto/caam/ctrl.c | 18 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 10 +- + drivers/crypto/ccp/psp-dev.c | 49 +- + drivers/crypto/ccp/psp-dev.h | 22 + + drivers/crypto/ccp/sev-dev.c | 32 +- + drivers/crypto/ccp/sp-pci.c | 62 ++ + drivers/crypto/ccree/cc_buffer_mgr.c | 27 +- + drivers/crypto/ccree/cc_driver.c | 24 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 222 +++++-- + drivers/crypto/hisilicon/qm.c | 282 ++++++++- + drivers/crypto/hisilicon/sec2/sec_main.c | 108 +++- + drivers/crypto/hisilicon/sgl.c | 6 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 2 +- + drivers/crypto/hisilicon/zip/zip_main.c | 185 +++++- + drivers/crypto/keembay/keembay-ocs-aes-core.c | 9 +- + drivers/crypto/marvell/cesa/cipher.c | 1 - + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 15 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 4 - + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 15 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 4 - + drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 18 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 13 + + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 6 + + drivers/crypto/qat/qat_common/adf_gen2_pfvf.c | 78 ++- + drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 61 +- + drivers/crypto/qat/qat_common/adf_isr.c | 21 +- + drivers/crypto/qat/qat_common/adf_pfvf_msg.h | 4 +- + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 6 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 16 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 1 + + drivers/crypto/qat/qat_common/qat_uclo.c | 2 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 126 ++-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 4 - + drivers/crypto/sa2ul.c | 1 + + drivers/crypto/ux500/hash/hash_core.c | 4 +- + include/crypto/sm4.h | 4 + + include/linux/hisi_acc_qm.h | 23 +- + lib/crypto/Kconfig | 6 - + lib/crypto/Makefile | 6 - + 72 files changed, 3586 insertions(+), 511 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ccp + create mode 100644 arch/arm64/crypto/sm4-ce-cipher-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-cipher-glue.c + create mode 100644 arch/arm64/crypto/sm4-neon-core.S + create mode 100644 arch/arm64/crypto/sm4-neon-glue.c + rename {lib/crypto => crypto}/sm3.c (100%) + rename {lib/crypto => crypto}/sm4.c (94%) + create mode 100644 drivers/char/hw_random/mpfs-rng.c +Merging drm/drm-next (15e2b419a837 Merge tag 'drm-misc-next-2022-04-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_dpm.c +Auto-merging drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_sync.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_sync.c +Auto-merging drivers/gpu/drm/vc4/Kconfig +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/of/platform.c +Resolved 'drivers/gpu/drm/radeon/radeon_sync.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 80a7d9b5288b] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../allwinner,sun4i-a10-display-engine.yaml | 1 + + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 + + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 + + .../display/allwinner,sun8i-r40-tcon-top.yaml | 133 +- + .../bindings/display/bridge/chipone,icn6211.yaml | 18 +- + .../bindings/display/bridge/ite,it66121.yaml | 3 + + .../bindings/display/bridge/lontium,lt9211.yaml | 117 ++ + .../bindings/display/bridge/toshiba,tc358767.yaml | 22 +- + .../display/panel/leadtek,ltk035c5444t.yaml | 59 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/sitronix,st7735r.yaml | 6 +- + .../bindings/display/solomon,ssd1307fb.yaml | 95 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 13 + + Documentation/gpu/drm-kms-helpers.rst | 43 +- + Documentation/gpu/drm-mm.rst | 9 + + Documentation/gpu/drm-uapi.rst | 4 +- + Documentation/gpu/drm-usage-stats.rst | 112 ++ + Documentation/gpu/i915.rst | 42 +- + Documentation/gpu/index.rst | 1 + + Documentation/gpu/introduction.rst | 60 + + MAINTAINERS | 13 + + arch/x86/Kconfig | 6 + + arch/x86/boot/video-vesa.c | 4 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-buf.c | 26 +- + drivers/dma-buf/dma-resv.c | 459 +++--- + drivers/dma-buf/st-dma-resv.c | 157 +- + drivers/firmware/Kconfig | 6 +- + drivers/gpu/drm/Kconfig | 41 +- + drivers/gpu/drm/Makefile | 29 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 308 ++++ + .../amdgpu/amdgpu_psp_ta.h} | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 97 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1203 ++------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 977 ++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 359 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 89 ++ + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 99 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 3 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 21 - + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 74 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 7 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 71 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 6 + + drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 152 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 49 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 39 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 83 +- + drivers/gpu/drm/amd/display/Kconfig | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 48 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 37 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 9 +- + .../drm/amd/display/dc/bios/bios_parser_common.c | 3 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 3 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 17 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 3 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 13 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 198 +-- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 91 +- + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 - + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 56 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 26 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 5 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 363 +---- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 26 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 235 +-- + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 26 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 234 +-- + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 19 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 863 ++++++++++ + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 44 + + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 9 +- + .../gpu/drm/amd/display/dc/link/link_dp_trace.c | 20 + + .../gpu/drm/amd/display/dc/link/link_dp_trace.h | 5 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 52 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 1 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 28 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 27 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 19 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 5 + + .../drm/amd/display/dc/virtual/virtual_link_hwss.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 48 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 2 +- + .../gpu/drm/amd/display/include/grph_object_id.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 76 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 38 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 12 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 12 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 38 + + .../drm/amd/display/modules/power/power_helpers.h | 1 + + drivers/gpu/drm/amd/include/amd_shared.h | 66 +- + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 13 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 24 + + drivers/gpu/drm/amd/include/discovery.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 87 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 17 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 147 ++ + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + + .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 7 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 31 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 23 +- + drivers/gpu/drm/arm/malidp_crtc.c | 5 +- + drivers/gpu/drm/arm/malidp_planes.c | 14 +- + drivers/gpu/drm/bridge/Kconfig | 31 +- + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 7 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 10 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +- + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 38 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 66 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 4 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 4 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 2 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 596 ++++++- + drivers/gpu/drm/bridge/display-connector.c | 15 + + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 629 +++++++- + drivers/gpu/drm/bridge/lontium-lt9211.c | 802 ++++++++++ + drivers/gpu/drm/bridge/lontium-lt9611.c | 49 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 30 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/panel.c | 6 + + drivers/gpu/drm/bridge/parade-ps8622.c | 7 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 13 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 12 + + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 197 +++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 192 ++- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 16 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 51 +- + drivers/gpu/drm/bridge/tc358762.c | 10 +- + drivers/gpu/drm/bridge/tc358764.c | 104 +- + drivers/gpu/drm/bridge/tc358767.c | 587 ++++++- + drivers/gpu/drm/bridge/tc358775.c | 13 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 12 +- + drivers/gpu/drm/display/Kconfig | 49 + + drivers/gpu/drm/display/Makefile | 16 + + .../drm_display_helper_mod.c} | 10 +- + drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c | 4 +- + drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c | 4 +- + drivers/gpu/drm/{dp => display}/drm_dp_cec.c | 2 +- + .../drm/{dp => display}/drm_dp_dual_mode_helper.c | 2 +- + .../drm/{dp/drm_dp.c => display/drm_dp_helper.c} | 95 +- + .../drm/{dp => display}/drm_dp_helper_internal.h | 0 + .../gpu/drm/{dp => display}/drm_dp_mst_topology.c | 2 +- + .../{dp => display}/drm_dp_mst_topology_internal.h | 2 +- + .../drm/{drm_dsc.c => display/drm_dsc_helper.c} | 5 +- + .../drm/{drm_hdcp.c => display/drm_hdcp_helper.c} | 4 +- + drivers/gpu/drm/display/drm_hdmi_helper.c | 199 +++ + drivers/gpu/drm/{ => display}/drm_scdc_helper.c | 3 +- + drivers/gpu/drm/dp/Makefile | 9 - + drivers/gpu/drm/drm_atomic.c | 20 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 - + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_bridge_connector.c | 4 +- + drivers/gpu/drm/drm_buddy.c | 3 + + drivers/gpu/drm/drm_connector.c | 34 - + drivers/gpu/drm/drm_crtc_helper.c | 12 +- + drivers/gpu/drm/drm_edid.c | 1036 ++++++------ + drivers/gpu/drm/drm_format_helper.c | 171 +- + drivers/gpu/drm/drm_gem.c | 83 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- + drivers/gpu/drm/drm_mipi_dsi.c | 6 +- + drivers/gpu/drm/drm_modes.c | 29 +- + drivers/gpu/drm/drm_vblank.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 77 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 241 +-- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 + + drivers/gpu/drm/gma500/cdv_device.c | 11 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/framebuffer.c | 10 +- + drivers/gpu/drm/gma500/gem.c | 161 +- + drivers/gpu/drm/gma500/gem.h | 13 +- + drivers/gpu/drm/gma500/gma_display.c | 53 +- + drivers/gpu/drm/gma500/gma_display.h | 10 +- + drivers/gpu/drm/gma500/gtt.c | 295 ++-- + drivers/gpu/drm/gma500/gtt.h | 8 +- + drivers/gpu/drm/gma500/intel_bios.c | 3 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 25 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 1 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - + drivers/gpu/drm/gma500/oaktrail_lvds.c | 16 +- + drivers/gpu/drm/gma500/opregion.c | 5 +- + drivers/gpu/drm/gma500/power.c | 15 +- + drivers/gpu/drm/gma500/psb_device.c | 29 +- + drivers/gpu/drm/gma500/psb_drv.c | 34 +- + drivers/gpu/drm/gma500/psb_drv.h | 90 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 39 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +- + drivers/gpu/drm/gma500/psb_irq.c | 94 +- + drivers/gpu/drm/gma500/psb_irq.h | 19 +- + drivers/gpu/drm/i915/Kconfig | 8 +- + drivers/gpu/drm/i915/Makefile | 11 + + drivers/gpu/drm/i915/display/g4x_dp.c | 73 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 36 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 17 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 143 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 45 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 3 +- + drivers/gpu/drm/i915/display/intel_bios.c | 509 ++++-- + drivers/gpu/drm/i915/display/intel_bw.c | 312 ++-- + drivers/gpu/drm/i915/display/intel_bw.h | 12 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 96 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 + + drivers/gpu/drm/i915/display/intel_color.c | 95 +- + drivers/gpu/drm/i915/display/intel_color.h | 3 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 35 +- + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 8 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 27 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 34 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 40 +- + drivers/gpu/drm/i915/display/intel_display.c | 786 +++++----- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 302 +--- + drivers/gpu/drm/i915/display/intel_display_power.c | 541 ++----- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + .../drm/i915/display/intel_display_power_well.c | 113 ++ + .../drm/i915/display/intel_display_power_well.h | 153 ++ + drivers/gpu/drm/i915/display/intel_display_trace.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 49 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 131 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 10 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 30 + + drivers/gpu/drm/i915/display/intel_dp.c | 569 ++++--- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 6 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 31 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 44 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 144 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 4 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 406 ++--- + drivers/gpu/drm/i915/display/intel_drrs.h | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 7 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 24 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 7 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fb.c | 70 +- + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 96 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 144 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 57 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 22 +- + drivers/gpu/drm/i915/display/intel_panel.c | 359 +++-- + drivers/gpu/drm/i915/display/intel_panel.h | 33 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 99 +- + drivers/gpu/drm/i915/display/intel_pch_display.h | 10 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 57 +- + drivers/gpu/drm/i915/display/intel_psr.c | 183 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/display/intel_qp_tables.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 89 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 51 +- + drivers/gpu/drm/i915/display/intel_tv.c | 12 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 21 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 26 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 4 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 22 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 266 +++- + drivers/gpu/drm/i915/display/vlv_dsi.c | 15 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 71 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 6 + + drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 46 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_region.h | 7 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 147 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 4 - + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 8 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 54 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 9 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 18 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 113 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 4 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 12 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_context.c | 29 +- + drivers/gpu/drm/i915/gt/intel_context.h | 15 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 24 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 13 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 51 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 13 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 11 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 56 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 696 +------- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 29 + + drivers/gpu/drm/i915/gt/intel_gsc.c | 224 +++ + drivers/gpu/drm/i915/gt/intel_gsc.h | 37 + + drivers/gpu/drm/i915/gt/intel_gt.c | 223 ++- + drivers/gpu/drm/i915/gt/intel_gt.h | 41 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 + + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 20 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 654 ++++++++ + drivers/gpu/drm/i915/gt/intel_gt_gmch.h | 46 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 13 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 21 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 94 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 22 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 122 ++ + drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 34 + + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 601 +++++++ + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.h | 15 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 18 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 68 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 67 +- + drivers/gpu/drm/i915/gt/intel_hwconfig.h | 21 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 39 +- + drivers/gpu/drm/i915/gt/intel_lrc.h | 27 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 390 ++++- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 13 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 139 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 6 +- + drivers/gpu/drm/i915/gt/intel_rps_types.h | 15 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 63 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 50 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 40 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 21 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 86 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 259 ++- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 3 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 14 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 4 + + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 15 + + drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 218 +++ + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 48 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 19 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 185 ++- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 1657 ++++++++++++++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 33 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 92 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 164 ++ + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 130 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 59 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 645 +++++--- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 31 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 20 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 30 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 42 +- + drivers/gpu/drm/i915/i915_driver.h | 4 + + drivers/gpu/drm/i915/i915_drm_client.c | 158 ++ + drivers/gpu/drm/i915/i915_drm_client.h | 68 + + drivers/gpu/drm/i915/i915_drv.h | 145 +- + drivers/gpu/drm/i915/i915_file_private.h | 3 + + drivers/gpu/drm/i915/i915_gem.c | 89 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 316 ++-- + drivers/gpu/drm/i915/i915_gpu_error.h | 43 +- + drivers/gpu/drm/i915/i915_params.c | 10 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 43 +- + drivers/gpu/drm/i915/i915_pmu.c | 5 +- + drivers/gpu/drm/i915/i915_query.c | 94 +- + drivers/gpu/drm/i915/i915_reg.h | 151 +- + drivers/gpu/drm/i915/i915_reg_defs.h | 2 - + drivers/gpu/drm/i915/i915_request.c | 3 +- + drivers/gpu/drm/i915/i915_suspend.c | 4 - + drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 310 +--- + drivers/gpu/drm/i915/i915_sysfs.h | 3 + + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 4 +- + drivers/gpu/drm/i915/i915_utils.c | 11 + + drivers/gpu/drm/i915/i915_utils.h | 37 +- + drivers/gpu/drm/i915/i915_vma.c | 119 +- + drivers/gpu/drm/i915/i915_vma.h | 14 - + drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 6 + + drivers/gpu/drm/i915/i915_vma_types.h | 8 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 + + drivers/gpu/drm/i915/intel_dram.c | 10 +- + drivers/gpu/drm/i915/intel_memory_region.c | 4 +- + drivers/gpu/drm/i915/intel_memory_region.h | 10 +- + drivers/gpu/drm/i915/intel_pch.c | 3 +- + drivers/gpu/drm/i915/intel_pcode.c | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 526 +++---- + drivers/gpu/drm/i915/intel_pm.h | 1 + + drivers/gpu/drm/i915/intel_region_ttm.c | 7 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 1 + + drivers/gpu/drm/i915/intel_step.c | 7 + + drivers/gpu/drm/i915/intel_uncore.c | 113 +- + drivers/gpu/drm/i915/intel_uncore.h | 7 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 - + drivers/gpu/drm/i915/selftests/i915_active.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 18 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 13 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 4 + + drivers/gpu/drm/i915/vlv_suspend.c | 3 +- + drivers/gpu/drm/imx/imx-ldb.c | 3 +- + drivers/gpu/drm/ingenic/Kconfig | 9 + + drivers/gpu/drm/ingenic/Makefile | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +- + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 103 ++ + drivers/gpu/drm/lima/lima_gem.c | 17 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 43 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 12 + + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/msm/Kconfig | 3 +- + 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 | 3 +- + drivers/gpu/drm/msm/edp/edp.h | 3 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 24 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 170 +- + drivers/gpu/drm/nouveau/Kconfig | 4 +- + drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base917c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 27 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 18 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/wndwgv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 198 ++- + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 12 +- + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 30 +- + drivers/gpu/drm/panel/panel-edp.c | 6 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 31 +- + drivers/gpu/drm/panel/panel-lvds.c | 37 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 482 ++++++ + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 29 + + drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 6 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 3 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 5 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 45 +- + drivers/gpu/drm/radeon/Makefile | 8 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/cayman_blit_shaders.c | 320 ---- + drivers/gpu/drm/radeon/cayman_blit_shaders.h | 294 +++- + drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 303 ---- + drivers/gpu/drm/radeon/evergreen_blit_shaders.h | 278 +++- + drivers/gpu/drm/radeon/r600_blit_shaders.c | 719 --------- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 + + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 9 +- + drivers/gpu/drm/radeon/radeon_mn.c | 4 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 21 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_prime.c | 16 +- + drivers/gpu/drm/radeon/radeon_sync.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 36 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 12 +- + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/radeon/si_blit_shaders.c | 253 --- + drivers/gpu/drm/radeon/si_blit_shaders.h | 223 ++- + drivers/gpu/drm/rockchip/Kconfig | 4 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 43 +- + drivers/gpu/drm/scheduler/sched_main.c | 5 +- + drivers/gpu/drm/selftests/test-drm_buddy.c | 10 +- + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +- + drivers/gpu/drm/solomon/Kconfig | 20 +- + drivers/gpu/drm/solomon/Makefile | 1 + + drivers/gpu/drm/solomon/ssd130x-i2c.c | 60 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 178 +++ + drivers/gpu/drm/solomon/ssd130x.c | 154 +- + drivers/gpu/drm/solomon/ssd130x.h | 18 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 22 +- + drivers/gpu/drm/stm/ltdc.c | 16 +- + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 40 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 1 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 - + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 8 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 7 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 1 + + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 74 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 14 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 15 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 30 - + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 6 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 27 + + drivers/gpu/drm/tegra/Kconfig | 4 +- + drivers/gpu/drm/tegra/dp.c | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 4 +- + drivers/gpu/drm/tegra/sor.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 18 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 262 ++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 40 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 34 +- + drivers/gpu/drm/ttm/ttm_device.c | 82 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 21 +- + drivers/gpu/drm/ttm/ttm_resource.c | 231 ++- + drivers/gpu/drm/ttm/ttm_tt.c | 28 +- + drivers/gpu/drm/v3d/v3d_gem.c | 19 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 3 +- + drivers/gpu/drm/vc4/Kconfig | 2 + + drivers/gpu/drm/vc4/vc4_crtc.c | 14 +- + drivers/gpu/drm/vc4/vc4_drv.h | 15 +- + drivers/gpu/drm/vc4/vc4_gem.c | 15 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 487 +++++- + drivers/gpu/drm/vc4/vc4_hdmi.h | 40 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + drivers/gpu/drm/vc4/vc4_hvs.c | 153 +- + drivers/gpu/drm/vc4/vc4_irq.c | 5 + + drivers/gpu/drm/vc4/vc4_kms.c | 87 +- + drivers/gpu/drm/vc4/vc4_regs.h | 28 +- + drivers/gpu/drm/vc4/vc4_trace.h | 95 ++ + drivers/gpu/drm/vc4/vc4_txp.c | 8 +- + drivers/gpu/drm/vgem/vgem_fence.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 38 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 81 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 445 ++++-- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- + drivers/gpu/drm/xlnx/Kconfig | 3 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 9 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/misc/mei/Kconfig | 14 + + drivers/misc/mei/Makefile | 3 + + drivers/misc/mei/bus-fixup.c | 25 + + drivers/misc/mei/gsc-me.c | 259 +++ + drivers/misc/mei/hdcp/mei_hdcp.h | 2 +- + drivers/misc/mei/hw-me.c | 29 +- + drivers/misc/mei/hw-me.h | 2 + + drivers/of/platform.c | 83 +- + drivers/video/fbdev/Kconfig | 14 +- + drivers/video/fbdev/core/fb_defio.c | 9 +- + drivers/video/fbdev/core/fbcon.c | 708 ++++----- + drivers/video/fbdev/core/fbcon.h | 8 +- + drivers/video/fbdev/core/fbmem.c | 37 +- + drivers/video/fbdev/core/fbsysfs.c | 2 + + drivers/video/fbdev/offb.c | 98 +- + include/drm/bridge/dw_hdmi.h | 11 +- + .../drm/{dp/drm_dp_helper.h => display/drm_dp.h} | 697 +------- + include/drm/{dp => display}/drm_dp_aux_bus.h | 0 + .../drm/{dp => display}/drm_dp_dual_mode_helper.h | 0 + include/drm/display/drm_dp_helper.h | 722 +++++++++ + include/drm/{dp => display}/drm_dp_mst_helper.h | 2 +- + include/drm/{ => display}/drm_dsc.h | 8 +- + include/drm/display/drm_dsc_helper.h | 20 + + include/drm/{ => display}/drm_hdcp.h | 14 +- + include/drm/display/drm_hdcp_helper.h | 22 + + include/drm/display/drm_hdmi_helper.h | 27 + + .../drm/{drm_scdc_helper.h => display/drm_scdc.h} | 52 +- + include/drm/display/drm_scdc_helper.h | 79 + + include/drm/drm_atomic.h | 27 +- + include/drm/drm_connector.h | 3 - + include/drm/drm_edid.h | 24 +- + include/drm/drm_file.h | 2 +- + include/drm/drm_format_helper.h | 5 +- + include/drm/drm_gem.h | 5 - + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/gpu_scheduler.h | 1 + + include/drm/i915_drm.h | 3 +- + include/drm/i915_mei_hdcp_interface.h | 2 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 64 +- + include/drm/ttm/ttm_bo_driver.h | 40 +- + include/drm/ttm/ttm_device.h | 11 - + include/drm/ttm/ttm_resource.h | 77 + + include/drm/ttm/ttm_tt.h | 4 +- + include/linux/dma-buf.h | 26 +- + include/linux/dma-resv.h | 233 ++- + include/linux/efi.h | 4 - + include/linux/fb.h | 1 - + include/linux/mei_aux.h | 19 + + include/linux/seqlock.h | 8 +- + include/uapi/drm/drm_fourcc.h | 47 + + include/uapi/drm/i915_drm.h | 291 +++- + include/uapi/drm/vmwgfx_drm.h | 9 +- + kernel/futex/futex.h | 1 + + 827 files changed, 29192 insertions(+), 16379 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt9211.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml + create mode 100644 Documentation/gpu/drm-usage-stats.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c + rename drivers/gpu/drm/{radeon/r600_blit_shaders.h => amd/amdgpu/amdgpu_psp_ta.h} (56%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h + create mode 100644 drivers/gpu/drm/bridge/lontium-lt9211.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c + create mode 100644 drivers/gpu/drm/display/Kconfig + create mode 100644 drivers/gpu/drm/display/Makefile + rename drivers/gpu/drm/{dp/drm_dp_helper_mod.c => display/drm_display_helper_mod.c} (51%) + rename drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c (99%) + rename drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c (99%) + rename drivers/gpu/drm/{dp => display}/drm_dp_cec.c (99%) + rename drivers/gpu/drm/{dp => display}/drm_dp_dual_mode_helper.c (99%) + rename drivers/gpu/drm/{dp/drm_dp.c => display/drm_dp_helper.c} (98%) + rename drivers/gpu/drm/{dp => display}/drm_dp_helper_internal.h (100%) + rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology.c (99%) + rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology_internal.h (94%) + rename drivers/gpu/drm/{drm_dsc.c => display/drm_dsc_helper.c} (99%) + rename drivers/gpu/drm/{drm_hdcp.c => display/drm_hdcp_helper.c} (99%) + create mode 100644 drivers/gpu/drm/display/drm_hdmi_helper.c + rename drivers/gpu/drm/{ => display}/drm_scdc_helper.c (99%) + delete mode 100644 drivers/gpu/drm/dp/Makefile + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gsc.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gsc.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_hwconfig.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c + create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c + create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h + create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c + create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c + delete mode 100644 drivers/gpu/drm/radeon/cayman_blit_shaders.c + delete mode 100644 drivers/gpu/drm/radeon/evergreen_blit_shaders.c + delete mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c + delete mode 100644 drivers/gpu/drm/radeon/si_blit_shaders.c + create mode 100644 drivers/gpu/drm/solomon/ssd130x-spi.c + create mode 100644 drivers/misc/mei/gsc-me.c + rename include/drm/{dp/drm_dp_helper.h => display/drm_dp.h} (74%) + rename include/drm/{dp => display}/drm_dp_aux_bus.h (100%) + rename include/drm/{dp => display}/drm_dp_dual_mode_helper.h (100%) + create mode 100644 include/drm/display/drm_dp_helper.h + rename include/drm/{dp => display}/drm_dp_mst_helper.h (99%) + rename include/drm/{ => display}/drm_dsc.h (97%) + create mode 100644 include/drm/display/drm_dsc_helper.h + rename include/drm/{ => display}/drm_hdcp.h (95%) + create mode 100644 include/drm/display/drm_hdcp_helper.h + create mode 100644 include/drm/display/drm_hdmi_helper.h + rename include/drm/{drm_scdc_helper.h => display/drm_scdc.h} (65%) + create mode 100644 include/drm/display/drm_scdc_helper.h + create mode 100644 include/linux/mei_aux.h +Merging drm-misc/for-linux-next (3fa50896c359 drm/rockchip: Support YUV formats with U/V swapped) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Merge made by the 'ort' strategy. + .../bindings/display/bridge/fsl,ldb.yaml | 92 ++++++ + .../bindings/display/panel/panel-simple.yaml | 2 + + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 8 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 27 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 116 ++++--- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 19 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 342 +++++++++++++++++++++ + drivers/gpu/drm/bridge/ite-it6505.c | 29 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 12 +- + drivers/gpu/drm/display/Kconfig | 6 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 5 +- + drivers/gpu/drm/drm_atomic_uapi.c | 47 +-- + drivers/gpu/drm/drm_edid.c | 65 ++-- + drivers/gpu/drm/drm_gem_atomic_helper.c | 73 ++++- + drivers/gpu/drm/drm_plane.c | 14 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 12 +- + drivers/gpu/drm/panel/panel-simple.c | 40 ++- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 60 ++-- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 7 +- + drivers/gpu/drm/vc4/vc4_bo.c | 8 +- + drivers/gpu/drm/vc4/vc4_plane.c | 7 +- + include/drm/drm_atomic_uapi.h | 2 - + include/drm/drm_plane.h | 4 +- + 34 files changed, 804 insertions(+), 258 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml + create mode 100644 drivers/gpu/drm/bridge/fsl-ldb.c +Merging amdgpu/drm-next (3da2c38231a4 drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5fddf6e96f89] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 371 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 291 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 125 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 18 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 13 - + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 620 + + drivers/gpu/drm/amd/amdgpu/soc21.h | 30 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 30 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 33 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 66 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 17 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 114 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 6 - + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 + + drivers/gpu/drm/amd/display/dc/dc.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 34 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 9 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 4 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 145 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../amd/include/asic_reg/gc/gc_11_0_0_default.h | 6114 +++ + .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 11670 ++++++ + .../amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h | 41635 +++++++++++++++++++ + .../drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h | 461 + + .../amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h | 682 + + drivers/gpu/drm/amd/include/atombios.h | 2 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 80 +- + drivers/gpu/drm/amd/include/discovery.h | 114 +- + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 14 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios.h | 6 +- + drivers/gpu/drm/radeon/cik_blit_shaders.c | 246 - + drivers/gpu/drm/radeon/cik_blit_shaders.h | 219 +- + drivers/gpu/drm/radeon/si_dpm.c | 4 +- + 82 files changed, 62772 insertions(+), 796 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.c +$ git am -3 ../patches/0001-fix-up-for-drm-ttm-rework-bulk-move-handling-v5.patch +Applying: fix up for "drm/ttm: rework bulk move handling v5" +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +$ git add -A . +$ git commit -v -a --amend +[master 5726149a9718] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux + Date: Tue May 3 10:11:09 2022 +1000 +Merging drm-intel/for-linux-next (c140915c00c9 drm/i915: move tons of power well initializers to rodata) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio-mediated-device.rst | 27 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/i915/Kconfig | 36 +- + drivers/gpu/drm/i915/Makefile | 9 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 3 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 8 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 171 +- + drivers/gpu/drm/i915/display/intel_display.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 5283 +++----------------- + drivers/gpu/drm/i915/display/intel_display_power.h | 126 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 1501 ++++++ + .../gpu/drm/i915/display/intel_display_power_map.h | 14 + + .../drm/i915/display/intel_display_power_well.c | 1813 ++++++- + .../drm/i915/display/intel_display_power_well.h | 132 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 33 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_dpll.c | 196 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 6 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 268 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 9 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 17 +- + drivers/gpu/drm/i915/display/intel_pps.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 3 + + drivers/gpu/drm/i915/display/intel_tc.c | 5 +- + drivers/gpu/drm/i915/gvt/Makefile | 30 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 89 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 36 +- + drivers/gpu/drm/i915/gvt/execlist.c | 12 +- + drivers/gpu/drm/i915/gvt/firmware.c | 25 +- + drivers/gpu/drm/i915/gvt/gtt.c | 55 +- + drivers/gpu/drm/i915/gvt/gvt.c | 340 -- + drivers/gpu/drm/i915/gvt/gvt.h | 128 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1035 +--- + drivers/gpu/drm/i915/gvt/hypercall.h | 82 - + drivers/gpu/drm/i915/gvt/interrupt.c | 40 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1097 ++-- + drivers/gpu/drm/i915/gvt/mmio.c | 4 +- + drivers/gpu/drm/i915/gvt/mmio.h | 1 - + drivers/gpu/drm/i915/gvt/mpt.h | 400 -- + drivers/gpu/drm/i915/gvt/opregion.c | 148 +- + drivers/gpu/drm/i915/gvt/page_track.c | 8 +- + drivers/gpu/drm/i915/gvt/reg.h | 9 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 37 +- + drivers/gpu/drm/i915/gvt/trace.h | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 22 +- + drivers/gpu/drm/i915/i915_driver.c | 7 - + drivers/gpu/drm/i915/i915_drv.h | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/intel_device_info.c | 30 +- + drivers/gpu/drm/i915/intel_device_info.h | 11 +- + drivers/gpu/drm/i915/intel_gvt.c | 252 +- + drivers/gpu/drm/i915/intel_gvt.h | 32 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1292 +++++ + drivers/gpu/drm/i915/intel_pm.c | 19 + + drivers/s390/cio/vfio_ccw_ops.c | 7 +- + drivers/s390/crypto/vfio_ap_ops.c | 9 +- + drivers/vfio/mdev/Makefile | 2 +- + drivers/vfio/mdev/mdev_core.c | 52 +- + drivers/vfio/mdev/mdev_driver.c | 10 - + drivers/vfio/mdev/mdev_private.h | 6 +- + drivers/vfio/mdev/mdev_sysfs.c | 37 +- + drivers/vfio/mdev/vfio_mdev.c | 152 - + include/drm/i915_pciids.h | 31 + + include/linux/mdev.h | 82 +- + samples/vfio-mdev/mbochs.c | 9 +- + samples/vfio-mdev/mdpy.c | 9 +- + samples/vfio-mdev/mtty.c | 39 +- + 71 files changed, 7204 insertions(+), 8175 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.h + delete mode 100644 drivers/gpu/drm/i915/gvt/gvt.c + delete mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h + delete mode 100644 drivers/gpu/drm/i915/gvt/mpt.h + create mode 100644 drivers/gpu/drm/i915/intel_gvt_mmio_table.c + delete mode 100644 drivers/vfio/mdev/vfio_mdev.c +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (78f815c1cf8f drm/msm: return the average load over the polling period) +$ 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/adreno/a6xx_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging include/uapi/drm/drm_fourcc.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 ++--- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 17 ++-- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 63 ++++++++++++- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +- + drivers/gpu/drm/msm/msm_drv.c | 29 +++++- + drivers/gpu/drm/msm/msm_drv.h | 23 ----- + drivers/gpu/drm/msm/msm_fb.c | 20 +++-- + drivers/gpu/drm/msm/msm_fence.c | 6 +- + drivers/gpu/drm/msm/msm_fence.h | 3 + + drivers/gpu/drm/msm/msm_gem.c | 151 +++++++++++++++++++------------- + drivers/gpu/drm/msm/msm_gem.h | 53 +++++++++-- + drivers/gpu/drm/msm/msm_gem_submit.c | 32 ++++--- + drivers/gpu/drm/msm/msm_gem_vma.c | 61 +++++++++---- + drivers/gpu/drm/msm/msm_gpu.c | 48 +++++----- + drivers/gpu/drm/msm/msm_gpu.h | 25 ++++-- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 97 +++++++++++++++++--- + drivers/gpu/drm/msm/msm_rd.c | 5 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 13 ++- + drivers/gpu/drm/msm/msm_ringbuffer.h | 1 - + drivers/gpu/drm/msm/msm_submitqueue.c | 2 + + include/uapi/drm/drm_fourcc.h | 22 +++++ + include/uapi/drm/msm_drm.h | 7 ++ + 23 files changed, 496 insertions(+), 209 deletions(-) +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/drm/imx/ipuv3-plane.c | 8 +------- + drivers/gpu/ipu-v3/ipu-dc.c | 5 +++-- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 4 files changed, 8 insertions(+), 18 deletions(-) +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 11 ++----- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 54 +++++++++++++++++++++++++++++++++-- + 2 files changed, 55 insertions(+), 10 deletions(-) +Merging fbdev/for-next (f443e374ae13 Linux 5.17) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (d640947562ce regmap: cache: set max_register with reg_stride) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache.c | 4 ++-- + drivers/base/regmap/regmap-i3c.c | 2 +- + drivers/base/regmap/regmap-sccb.c | 2 +- + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + drivers/base/regmap/regmap-sdw.c | 2 +- + drivers/base/regmap/regmap-slimbus.c | 2 +- + drivers/base/regmap/regmap-w1.c | 6 +++--- + 7 files changed, 10 insertions(+), 10 deletions(-) +Merging sound/for-next (011b559be832 ALSA: pcm: Check for null pointer of pointer substream before dereferencing it) +$ 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 drivers/firewire/core-card.c +Auto-merging drivers/firewire/core-cdev.c +Auto-merging drivers/firewire/core-transaction.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/soc/codecs/cs35l41-lib.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 44 ++- + Documentation/sound/alsa-configuration.rst | 4 +- + drivers/firewire/core-card.c | 39 +++ + drivers/firewire/core-cdev.c | 6 +- + drivers/firewire/core-transaction.c | 18 ++ + include/linux/firewire.h | 3 + + include/sound/cs35l41.h | 59 ++++- + include/sound/hda_codec.h | 3 + + include/sound/jack.h | 1 + + sound/core/jack.c | 34 ++- + sound/core/pcm_memory.c | 3 +- + sound/pci/echoaudio/midi.c | 1 - + sound/pci/emu10k1/emu10k1_main.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 295 +++++++-------------- + sound/pci/hda/cs35l41_hda.h | 27 +- + sound/pci/hda/hda_codec.c | 11 +- + sound/pci/hda/hda_tegra.c | 2 + + sound/soc/codecs/cs35l41-i2c.c | 4 +- + sound/soc/codecs/cs35l41-lib.c | 190 ++++++++++++- + sound/soc/codecs/cs35l41-spi.c | 4 +- + sound/soc/codecs/cs35l41.c | 166 ++++++------ + sound/soc/codecs/cs35l41.h | 5 +- + sound/usb/implicit.c | 10 +- + sound/usb/quirks.c | 6 + + sound/usb/usbaudio.h | 6 + + tools/testing/selftests/alsa/mixer-test.c | 41 ++- + 26 files changed, 612 insertions(+), 375 deletions(-) +Merging sound-asoc/for-next (180e66c028cb Merge remote-tracking branch 'asoc/for-5.19' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging include/sound/cs35l41.h +Auto-merging sound/soc/codecs/cs35l41-i2c.c +Auto-merging sound/soc/codecs/cs35l41-lib.c +Auto-merging sound/soc/pxa/hx4700.c +Auto-merging sound/soc/pxa/palm27x.c +Auto-merging sound/soc/pxa/z2.c +Merge made by the 'ort' strategy. + .../bindings/dsp/mediatek,mt8195-dsp.yaml | 105 ++ + .../devicetree/bindings/sound/adi,max98396.yaml | 79 + + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 75 + + .../devicetree/bindings/sound/maxim,max98390.yaml | 5 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 32 + + .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - + ...t6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 81 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 17 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 17 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 17 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 11 +- + .../devicetree/bindings/sound/qcom,wcd938x.yaml | 3 + + .../bindings/sound/{tas2764.yaml => tas27xx.yaml} | 17 +- + .../devicetree/bindings/sound/wlf,wm8731.yaml | 97 ++ + Documentation/devicetree/bindings/sound/wm8731.txt | 27 - + MAINTAINERS | 2 + + arch/arm/configs/multi_v5_defconfig | 3 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 76 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-imx.c | 2 +- + drivers/staging/greybus/audio_codec.c | 12 +- + drivers/tty/serial/imx.c | 2 +- + drivers/video/fbdev/mx3fb.c | 2 +- + include/dt-bindings/sound/cs35l45.h | 20 + + .../{platform_data/dma-imx.h => dma/imx-dma.h} | 26 +- + include/linux/firmware/cirrus/cs_dsp.h | 28 +- + include/sound/cs35l41.h | 1 - + include/sound/intel-nhlt.h | 6 +- + include/sound/soc-card.h | 7 +- + include/sound/soc-dpcm.h | 2 + + include/sound/soc.h | 25 + + include/sound/sof.h | 23 +- + include/uapi/sound/intel/avs/tokens.h | 126 ++ + include/uapi/sound/sof/abi.h | 4 +- + sound/soc/Kconfig | 9 +- + sound/soc/Makefile | 5 + + sound/soc/amd/acp-da7219-max98357a.c | 4 +- + sound/soc/amd/acp-rt5645.c | 2 +- + sound/soc/amd/acp/acp-legacy-mach.c | 1 + + sound/soc/amd/acp/acp-mach-common.c | 4 +- + sound/soc/amd/acp/acp-sof-mach.c | 1 + + sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- + sound/soc/amd/vangogh/acp5x-mach.c | 8 +- + sound/soc/amd/yc/acp6x-mach.c | 42 +- + sound/soc/amd/yc/pci-acp6x.c | 9 +- + sound/soc/atmel/Kconfig | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 13 +- + sound/soc/au1x/Kconfig | 2 +- + sound/soc/codecs/Kconfig | 63 +- + sound/soc/codecs/Makefile | 16 + + sound/soc/codecs/ad193x-i2c.c | 6 +- + sound/soc/codecs/adau1372-i2c.c | 4 +- + sound/soc/codecs/adau1373.c | 5 +- + sound/soc/codecs/adau1701.c | 5 +- + sound/soc/codecs/adau1761-i2c.c | 8 +- + sound/soc/codecs/adau1781-i2c.c | 8 +- + sound/soc/codecs/adau1977-i2c.c | 8 +- + sound/soc/codecs/adau7118-i2c.c | 5 +- + sound/soc/codecs/adav803.c | 5 +- + sound/soc/codecs/ak4118.c | 5 +- + sound/soc/codecs/ak4535.c | 5 +- + sound/soc/codecs/ak4613.c | 377 ++++- + sound/soc/codecs/ak4641.c | 5 +- + sound/soc/codecs/ak4642.c | 8 +- + sound/soc/codecs/ak4671.c | 5 +- + sound/soc/codecs/alc5623.c | 24 +- + sound/soc/codecs/alc5632.c | 20 +- + sound/soc/codecs/cs35l32.c | 5 +- + sound/soc/codecs/cs35l33.c | 5 +- + sound/soc/codecs/cs35l34.c | 5 +- + sound/soc/codecs/cs35l35.c | 5 +- + sound/soc/codecs/cs35l36.c | 5 +- + sound/soc/codecs/cs35l41-i2c.c | 5 +- + sound/soc/codecs/cs35l41-lib.c | 16 +- + sound/soc/codecs/cs35l45-i2c.c | 74 + + sound/soc/codecs/cs35l45-spi.c | 74 + + sound/soc/codecs/cs35l45-tables.c | 202 +++ + sound/soc/codecs/cs35l45.c | 694 +++++++++ + sound/soc/codecs/cs35l45.h | 217 +++ + sound/soc/codecs/cs4234.c | 4 +- + sound/soc/codecs/cs4265.c | 5 +- + sound/soc/codecs/cs4270.c | 5 +- + sound/soc/codecs/cs4271-i2c.c | 5 +- + sound/soc/codecs/cs42l42.c | 5 +- + sound/soc/codecs/cs42l51-i2c.c | 5 +- + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 5 +- + sound/soc/codecs/cs42xx8-i2c.c | 5 +- + sound/soc/codecs/cs43130.c | 7 +- + sound/soc/codecs/cs4341.c | 5 +- + sound/soc/codecs/cs4349.c | 5 +- + sound/soc/codecs/cs53l30.c | 5 +- + sound/soc/codecs/cx2072x.c | 5 +- + sound/soc/codecs/da7210.c | 5 +- + sound/soc/codecs/da7213.c | 5 +- + sound/soc/codecs/da7218.c | 19 +- + sound/soc/codecs/da7219.c | 5 +- + sound/soc/codecs/da732x.c | 5 +- + sound/soc/codecs/da9055.c | 5 +- + sound/soc/codecs/dmic.c | 5 +- + sound/soc/codecs/es8316.c | 5 +- + sound/soc/codecs/es8328-i2c.c | 5 +- + sound/soc/codecs/isabelle.c | 5 +- + sound/soc/codecs/lm4857.c | 5 +- + sound/soc/codecs/lm49453.c | 5 +- + sound/soc/codecs/lpass-macro-common.c | 35 +- + sound/soc/codecs/max9768.c | 5 +- + sound/soc/codecs/max98088.c | 21 +- + sound/soc/codecs/max98090.c | 23 +- + sound/soc/codecs/max98095.c | 19 +- + sound/soc/codecs/max98371.c | 5 +- + sound/soc/codecs/max98373-i2c.c | 5 +- + sound/soc/codecs/max98390.c | 17 +- + sound/soc/codecs/max98396.c | 1636 ++++++++++++++++++++ + sound/soc/codecs/max98396.h | 305 ++++ + sound/soc/codecs/max9850.c | 5 +- + sound/soc/codecs/max98504.c | 5 +- + sound/soc/codecs/max98520.c | 4 +- + sound/soc/codecs/max9867.c | 5 +- + sound/soc/codecs/max9877.c | 5 +- + sound/soc/codecs/max98925.c | 5 +- + sound/soc/codecs/max98926.c | 5 +- + sound/soc/codecs/max98927.c | 5 +- + sound/soc/codecs/ml26124.c | 5 +- + sound/soc/codecs/mt6660.c | 5 +- + sound/soc/codecs/nau8540.c | 5 +- + sound/soc/codecs/nau8810.c | 5 +- + sound/soc/codecs/nau8821.c | 5 +- + sound/soc/codecs/nau8822.c | 5 +- + sound/soc/codecs/nau8824.c | 5 +- + sound/soc/codecs/nau8825.c | 5 +- + sound/soc/codecs/pcm1681.c | 5 +- + sound/soc/codecs/pcm1789-i2c.c | 9 +- + sound/soc/codecs/pcm1789.c | 4 +- + sound/soc/codecs/pcm1789.h | 2 +- + sound/soc/codecs/pcm179x-i2c.c | 5 +- + sound/soc/codecs/pcm186x-i2c.c | 24 +- + sound/soc/codecs/pcm3060-i2c.c | 5 +- + sound/soc/codecs/pcm3168a-i2c.c | 5 +- + sound/soc/codecs/pcm512x-i2c.c | 5 +- + sound/soc/codecs/rt1011.c | 5 +- + sound/soc/codecs/rt1015.c | 5 +- + sound/soc/codecs/rt1016.c | 5 +- + sound/soc/codecs/rt1019.c | 5 +- + sound/soc/codecs/rt1305.c | 5 +- + sound/soc/codecs/rt1308.c | 5 +- + sound/soc/codecs/rt274.c | 5 +- + sound/soc/codecs/rt286.c | 5 +- + sound/soc/codecs/rt298.c | 5 +- + sound/soc/codecs/rt5514.c | 5 +- + sound/soc/codecs/rt5616.c | 5 +- + sound/soc/codecs/rt5631.c | 5 +- + sound/soc/codecs/rt5640.c | 5 +- + sound/soc/codecs/rt5645.c | 5 +- + sound/soc/codecs/rt5651.c | 5 +- + sound/soc/codecs/rt5659.c | 5 +- + sound/soc/codecs/rt5660.c | 5 +- + sound/soc/codecs/rt5663.c | 5 +- + sound/soc/codecs/rt5665.c | 5 +- + sound/soc/codecs/rt5668.c | 5 +- + sound/soc/codecs/rt5670.c | 5 +- + sound/soc/codecs/rt5682-i2c.c | 5 +- + sound/soc/codecs/rt5682s.c | 32 +- + sound/soc/codecs/rt5682s.h | 6 +- + sound/soc/codecs/sgtl5000.c | 5 +- + sound/soc/codecs/ssm2518.c | 5 +- + sound/soc/codecs/ssm2602-i2c.c | 8 +- + sound/soc/codecs/ssm4567.c | 5 +- + sound/soc/codecs/sta32x.c | 5 +- + sound/soc/codecs/sta350.c | 5 +- + sound/soc/codecs/sta529.c | 5 +- + sound/soc/codecs/tas2552.c | 5 +- + sound/soc/codecs/tas2562.c | 25 +- + sound/soc/codecs/tas2764.c | 5 +- + sound/soc/codecs/tas2770.c | 5 +- + sound/soc/codecs/tas5086.c | 5 +- + sound/soc/codecs/tas571x.c | 11 +- + sound/soc/codecs/tas5720.c | 21 +- + sound/soc/codecs/tas6424.c | 9 +- + sound/soc/codecs/tda7419.c | 5 +- + sound/soc/codecs/tlv320adc3xxx.c | 21 +- + sound/soc/codecs/tlv320adcx140.c | 5 +- + sound/soc/codecs/tlv320aic23-i2c.c | 5 +- + sound/soc/codecs/tlv320aic31xx.c | 32 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 11 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 25 +- + sound/soc/codecs/tlv320dac33.c | 5 +- + sound/soc/codecs/ts3a227e.c | 5 +- + sound/soc/codecs/tscs42xx.c | 5 +- + sound/soc/codecs/tscs454.c | 5 +- + sound/soc/codecs/uda1380.c | 5 +- + sound/soc/codecs/wm1250-ev1.c | 5 +- + sound/soc/codecs/wm2000.c | 5 +- + sound/soc/codecs/wm2200.c | 5 +- + sound/soc/codecs/wm5100.c | 5 +- + sound/soc/codecs/wm8510.c | 5 +- + sound/soc/codecs/wm8523.c | 5 +- + sound/soc/codecs/wm8580.c | 5 +- + sound/soc/codecs/wm8711.c | 5 +- + sound/soc/codecs/wm8728.c | 5 +- + sound/soc/codecs/wm8731-i2c.c | 68 + + sound/soc/codecs/wm8731-spi.c | 59 + + sound/soc/codecs/wm8731.c | 267 +--- + sound/soc/codecs/wm8731.h | 27 + + sound/soc/codecs/wm8737.c | 5 +- + sound/soc/codecs/wm8741.c | 5 +- + sound/soc/codecs/wm8750.c | 5 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm8776.c | 5 +- + sound/soc/codecs/wm8804-i2c.c | 5 +- + sound/soc/codecs/wm8900.c | 5 +- + sound/soc/codecs/wm8903.c | 5 +- + sound/soc/codecs/wm8904.c | 9 +- + sound/soc/codecs/wm8940.c | 5 +- + sound/soc/codecs/wm8955.c | 5 +- + sound/soc/codecs/wm8960.c | 5 +- + sound/soc/codecs/wm8961.c | 5 +- + sound/soc/codecs/wm8962.c | 11 +- + sound/soc/codecs/wm8971.c | 5 +- + sound/soc/codecs/wm8974.c | 5 +- + sound/soc/codecs/wm8978.c | 5 +- + sound/soc/codecs/wm8983.c | 5 +- + sound/soc/codecs/wm8985.c | 8 +- + sound/soc/codecs/wm8988.c | 5 +- + sound/soc/codecs/wm8990.c | 5 +- + sound/soc/codecs/wm8991.c | 5 +- + sound/soc/codecs/wm8993.c | 5 +- + sound/soc/codecs/wm8995.c | 5 +- + sound/soc/codecs/wm8996.c | 5 +- + sound/soc/codecs/wm9081.c | 5 +- + sound/soc/codecs/wm9090.c | 5 +- + sound/soc/fsl/fsl_asrc.c | 8 +- + sound/soc/fsl/fsl_asrc_dma.c | 2 +- + sound/soc/fsl/fsl_easrc.h | 2 +- + sound/soc/fsl/fsl_esai.c | 6 +- + sound/soc/fsl/fsl_micfil.c | 369 ++--- + sound/soc/fsl/fsl_micfil.h | 269 +--- + sound/soc/fsl/imx-es8328.c | 2 +- + sound/soc/fsl/imx-hdmi.c | 8 +- + sound/soc/fsl/imx-pcm.h | 2 +- + sound/soc/fsl/imx-ssi.h | 2 +- + sound/soc/generic/audio-graph-card2.c | 5 +- + sound/soc/generic/simple-card-utils.c | 5 +- + sound/soc/img/img-i2s-in.c | 6 +- + sound/soc/img/img-parallel-out.c | 6 +- + sound/soc/img/img-spdif-in.c | 6 +- + sound/soc/img/img-spdif-out.c | 6 +- + sound/soc/intel/Kconfig | 7 +- + sound/soc/intel/atom/sst/sst.c | 1 - + sound/soc/intel/atom/sst/sst_drv_interface.c | 15 +- + sound/soc/intel/avs/Makefile | 3 +- + sound/soc/intel/avs/avs.h | 23 + + sound/soc/intel/avs/path.c | 1005 ++++++++++++ + sound/soc/intel/avs/path.h | 72 + + sound/soc/intel/avs/topology.c | 1600 +++++++++++++++++++ + sound/soc/intel/avs/topology.h | 194 +++ + sound/soc/intel/boards/bdw-rt5650.c | 6 +- + sound/soc/intel/boards/bdw-rt5677.c | 4 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 5 +- + sound/soc/intel/boards/bxt_rt298.c | 5 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- + sound/soc/intel/boards/bytcht_es8316.c | 8 +- + sound/soc/intel/boards/bytcr_rt5640.c | 36 +- + sound/soc/intel/boards/bytcr_rt5651.c | 7 +- + sound/soc/intel/boards/bytcr_wm5102.c | 6 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 28 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 12 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 5 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 5 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 5 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +- + sound/soc/intel/boards/kbl_rt5660.c | 15 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 8 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +- + sound/soc/intel/boards/skl_rt286.c | 5 +- + sound/soc/intel/boards/sof_cs42l42.c | 5 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 8 +- + sound/soc/intel/boards/sof_nau8825.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 5 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 14 +- + sound/soc/intel/boards/sof_ssp_amp.c | 6 +- + sound/soc/intel/catpt/messages.h | 4 +- + sound/soc/mediatek/Kconfig | 27 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 9 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 4 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 5 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 203 ++- + sound/soc/mediatek/mt8195/Makefile | 3 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 -------------- + ...8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 867 +++++++---- + sound/soc/pxa/Kconfig | 4 +- + sound/soc/pxa/hx4700.c | 6 +- + sound/soc/pxa/palm27x.c | 7 +- + sound/soc/pxa/ttc-dkb.c | 14 +- + sound/soc/pxa/z2.c | 7 +- + sound/soc/qcom/Kconfig | 2 + + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/sc7180.c | 4 +- + sound/soc/qcom/sc7280.c | 99 +- + sound/soc/qcom/sdm845.c | 2 +- + sound/soc/qcom/sm8250.c | 2 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 8 +- + sound/soc/rockchip/rk3399_gru_sound.c | 16 +- + sound/soc/rockchip/rockchip_max98090.c | 16 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/samsung/aries_wm8994.c | 4 +- + sound/soc/samsung/bells.c | 4 +- + sound/soc/samsung/h1940_uda1380.c | 3 +- + sound/soc/samsung/littlemill.c | 6 +- + sound/soc/samsung/lowland.c | 13 +- + sound/soc/samsung/midas_wm1811.c | 2 +- + sound/soc/samsung/rx1950_uda1380.c | 3 +- + sound/soc/samsung/smartq_wm8987.c | 8 +- + sound/soc/samsung/speyside.c | 14 +- + sound/soc/samsung/tobermory.c | 12 +- + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/rcar/core.c | 17 +- + sound/soc/sh/rcar/dma.c | 9 +- + sound/soc/sh/rcar/rsnd.h | 2 +- + sound/soc/sh/rcar/src.c | 7 +- + sound/soc/sh/rcar/ssi.c | 14 +- + sound/soc/sh/rcar/ssiu.c | 11 +- + sound/soc/sh/rz-ssi.c | 24 +- + sound/soc/soc-card.c | 56 +- + sound/soc/soc-core.c | 90 +- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-pcm.c | 38 +- + sound/soc/soc-topology.c | 455 +++--- + sound/soc/soc-utils-test.c | 186 +++ + sound/soc/soc-utils.c | 45 + + sound/soc/sof/Makefile | 2 +- + sound/soc/sof/amd/acp.c | 66 +- + sound/soc/sof/amd/acp.h | 8 +- + sound/soc/sof/amd/pci-rn.c | 14 +- + sound/soc/sof/amd/renoir.c | 6 +- + sound/soc/sof/compress.c | 8 +- + sound/soc/sof/control.c | 36 +- + sound/soc/sof/core.c | 15 +- + sound/soc/sof/debug.c | 7 +- + sound/soc/sof/imx/imx8.c | 40 +- + sound/soc/sof/imx/imx8m.c | 20 +- + sound/soc/sof/intel/Kconfig | 2 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 108 +- + sound/soc/sof/intel/bdw.c | 21 +- + sound/soc/sof/intel/byt.c | 56 +- + sound/soc/sof/intel/cnl.c | 113 +- + sound/soc/sof/intel/hda-common-ops.c | 106 ++ + sound/soc/sof/intel/hda-dai.c | 434 ++++-- + sound/soc/sof/intel/hda-dsp.c | 50 +- + sound/soc/sof/intel/hda-loader.c | 123 +- + sound/soc/sof/intel/hda.c | 40 +- + sound/soc/sof/intel/hda.h | 42 +- + sound/soc/sof/intel/icl.c | 121 +- + sound/soc/sof/intel/pci-apl.c | 36 +- + sound/soc/sof/intel/pci-cnl.c | 54 +- + sound/soc/sof/intel/pci-icl.c | 36 +- + sound/soc/sof/intel/pci-tgl.c | 97 +- + sound/soc/sof/intel/pci-tng.c | 27 +- + sound/soc/sof/intel/shim.h | 16 +- + sound/soc/sof/intel/tgl.c | 127 +- + sound/soc/sof/ipc.c | 962 +----------- + sound/soc/sof/ipc3-control.c | 131 +- + sound/soc/sof/ipc3-loader.c | 416 +++++ + sound/soc/sof/ipc3-pcm.c | 8 +- + sound/soc/sof/ipc3-priv.h | 24 + + sound/soc/sof/ipc3-topology.c | 38 +- + sound/soc/sof/ipc3.c | 1038 ++++++++++++- + sound/soc/sof/loader.c | 698 +-------- + sound/soc/sof/mediatek/Kconfig | 9 + + sound/soc/sof/mediatek/Makefile | 1 + + sound/soc/sof/mediatek/adsp_helper.h | 8 + + sound/soc/sof/mediatek/mt8186/Makefile | 4 + + sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 101 ++ + sound/soc/sof/mediatek/mt8186/mt8186-clk.h | 24 + + sound/soc/sof/mediatek/mt8186/mt8186-loader.c | 53 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 413 +++++ + sound/soc/sof/mediatek/mt8186/mt8186.h | 80 + + sound/soc/sof/mediatek/mt8195/mt8195.c | 26 +- + sound/soc/sof/ops.h | 8 + + sound/soc/sof/pcm.c | 7 +- + sound/soc/sof/pm.c | 22 +- + sound/soc/sof/sof-acpi-dev.c | 6 +- + sound/soc/sof/sof-audio.c | 96 +- + sound/soc/sof/sof-audio.h | 12 +- + sound/soc/sof/sof-client-ipc-msg-injector.c | 3 +- + sound/soc/sof/sof-client-probes.c | 9 +- + sound/soc/sof/sof-client.c | 2 +- + sound/soc/sof/sof-of-dev.c | 12 +- + sound/soc/sof/sof-of-dev.h | 1 + + sound/soc/sof/sof-pci-dev.c | 96 +- + sound/soc/sof/sof-priv.h | 88 +- + sound/soc/sof/topology.c | 35 +- + sound/soc/sof/trace.c | 61 +- + sound/soc/tegra/Kconfig | 12 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_asrc.c | 1046 +++++++++++++ + sound/soc/tegra/tegra186_asrc.h | 112 ++ + sound/soc/tegra/tegra210_ahub.c | 82 +- + sound/soc/tegra/tegra_asoc_machine.c | 30 +- + sound/soc/tegra/tegra_wm8903.c | 10 +- + sound/soc/ti/ams-delta.c | 4 +- + sound/soc/ti/omap-abe-twl6040.c | 8 +- + sound/soc/ti/omap-twl4030.c | 8 +- + sound/soc/ti/rx51.c | 2 +- + 425 files changed, 15122 insertions(+), 6396 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dsp/mediatek,mt8195-dsp.yaml + create mode 100644 Documentation/devicetree/bindings/sound/adi,max98396.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml + rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml + rename Documentation/devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} (73%) + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8731.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt + create mode 100644 include/dt-bindings/sound/cs35l45.h + rename include/linux/{platform_data/dma-imx.h => dma/imx-dma.h} (67%) + create mode 100644 include/uapi/sound/intel/avs/tokens.h + create mode 100644 sound/soc/codecs/cs35l45-i2c.c + create mode 100644 sound/soc/codecs/cs35l45-spi.c + create mode 100644 sound/soc/codecs/cs35l45-tables.c + create mode 100644 sound/soc/codecs/cs35l45.c + create mode 100644 sound/soc/codecs/cs35l45.h + create mode 100644 sound/soc/codecs/max98396.c + create mode 100644 sound/soc/codecs/max98396.h + create mode 100644 sound/soc/codecs/wm8731-i2c.c + create mode 100644 sound/soc/codecs/wm8731-spi.c + create mode 100644 sound/soc/intel/avs/path.c + create mode 100644 sound/soc/intel/avs/path.h + create mode 100644 sound/soc/intel/avs/topology.c + create mode 100644 sound/soc/intel/avs/topology.h + delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c + rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%) + create mode 100644 sound/soc/soc-utils-test.c + create mode 100644 sound/soc/sof/intel/hda-common-ops.c + create mode 100644 sound/soc/sof/ipc3-loader.c + create mode 100644 sound/soc/sof/ipc3-priv.h + create mode 100644 sound/soc/sof/mediatek/mt8186/Makefile + create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-clk.c + create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-clk.h + create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-loader.c + create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186.c + create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186.h + create mode 100644 sound/soc/tegra/tegra186_asrc.c + create mode 100644 sound/soc/tegra/tegra186_asrc.h +Merging modules/modules-next (eb28e156bfd4 kallsyms: enhance %pS/s/b printing when KALLSYSMS is disabled) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging kernel/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/Kconfig | 6 + + arch/powerpc/Kconfig | 1 + + include/linux/kallsyms.h | 2 + + include/linux/kdb.h | 1 + + include/linux/module.h | 49 +- + kernel/Makefile | 5 +- + kernel/debug/kdb/kdb_io.c | 1 - + kernel/debug/kdb/kdb_keyboard.c | 1 - + kernel/debug/kdb/kdb_main.c | 49 - + kernel/debug/kdb/kdb_private.h | 4 - + kernel/debug/kdb/kdb_support.c | 1 - + kernel/kallsyms.c | 27 +- + kernel/module-internal.h | 50 - + kernel/module/Makefile | 20 + + kernel/module/debug_kmemleak.c | 30 + + .../{module_decompress.c => module/decompress.c} | 5 +- + kernel/module/internal.h | 267 +++ + kernel/module/kallsyms.c | 492 +++++ + kernel/module/kdb.c | 62 + + kernel/module/livepatch.c | 74 + + kernel/{module.c => module/main.c} | 2061 ++------------------ + kernel/module/procfs.c | 146 ++ + kernel/module/signing.c | 122 ++ + kernel/module/strict_rwx.c | 143 ++ + kernel/module/sysfs.c | 436 +++++ + kernel/module/tree_lookup.c | 117 ++ + kernel/module/version.c | 109 ++ + kernel/module_signing.c | 45 - + lib/vsprintf.c | 85 +- + 30 files changed, 2367 insertions(+), 2048 deletions(-) + delete mode 100644 kernel/module-internal.h + create mode 100644 kernel/module/Makefile + create mode 100644 kernel/module/debug_kmemleak.c + rename kernel/{module_decompress.c => module/decompress.c} (99%) + create mode 100644 kernel/module/internal.h + create mode 100644 kernel/module/kallsyms.c + create mode 100644 kernel/module/kdb.c + create mode 100644 kernel/module/livepatch.c + rename kernel/{module.c => module/main.c} (62%) + create mode 100644 kernel/module/procfs.c + create mode 100644 kernel/module/signing.c + create mode 100644 kernel/module/strict_rwx.c + create mode 100644 kernel/module/sysfs.c + create mode 100644 kernel/module/tree_lookup.c + create mode 100644 kernel/module/version.c + delete mode 100644 kernel/module_signing.c +Merging input/next (75e97ccaf557 Input: sun4i-lradc-keys - add support for R329 and D1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/input.c +Auto-merging drivers/input/tablet/aiptek.c +Merge made by the 'ort' strategy. + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 22 + + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 960 ++++++++ + .../devicetree/bindings/input/mtk-pmic-keys.txt | 1 + + drivers/input/input.c | 4 +- + drivers/input/joystick/Kconfig | 11 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/sensehat-joystick.c | 137 ++ + drivers/input/keyboard/clps711x-keypad.c | 3 +- + drivers/input/keyboard/ep93xx_keypad.c | 7 +- + drivers/input/keyboard/mt6779-keypad.c | 10 +- + drivers/input/keyboard/mtk-pmic-keys.c | 41 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 63 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/iqs7222.c | 2446 ++++++++++++++++++++ + drivers/input/misc/pm8941-pwrkey.c | 127 +- + drivers/input/rmi4/rmi_f54.c | 1 - + drivers/input/tablet/aiptek.c | 3 +- + 18 files changed, 3799 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml + create mode 100644 drivers/input/joystick/sensehat-joystick.c + create mode 100644 drivers/input/misc/iqs7222.c +$ git reset --hard HEAD^ +HEAD is now at bd57def733f6 Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +Merging next-20220426 version of input +$ git merge -m next-20220426/input b243018eafeb69bf074ef013c54504632fd161ec +Auto-merging drivers/input/input.c +Auto-merging drivers/input/tablet/aiptek.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 960 ++++++++ + drivers/input/input.c | 4 +- + drivers/input/joystick/Kconfig | 11 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/sensehat-joystick.c | 137 ++ + drivers/input/keyboard/clps711x-keypad.c | 3 +- + drivers/input/keyboard/ep93xx_keypad.c | 7 +- + drivers/input/keyboard/mt6779-keypad.c | 10 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 22 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/iqs7222.c | 2446 ++++++++++++++++++++ + drivers/input/misc/pm8941-pwrkey.c | 127 +- + drivers/input/rmi4/rmi_f54.c | 1 - + drivers/input/tablet/aiptek.c | 3 +- + 15 files changed, 3706 insertions(+), 37 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml + create mode 100644 drivers/input/joystick/sensehat-joystick.c + create mode 100644 drivers/input/misc/iqs7222.c +Merging block/for-next (e74c4a875ad8 Merge branch 'for-5.19/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/bdev.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/exfat/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/internal.h +Auto-merging fs/ntfs3/file.c +Auto-merging fs/xfs/xfs_log_cil.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/blkdev.h +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + arch/um/drivers/ubd_kern.c | 2 - + block/Makefile | 1 + + block/badblocks.c | 2 - + block/bdev.c | 16 +- + block/bfq-cgroup.c | 111 +- + block/bfq-iosched.c | 56 +- + block/bfq-iosched.h | 10 +- + block/bio.c | 135 +- + block/blk-cgroup-fc-appid.c | 57 + + block/blk-cgroup.c | 154 ++- + block/blk-cgroup.h | 138 +- + block/blk-core.c | 56 +- + block/blk-crypto-fallback.c | 14 +- + block/blk-lib.c | 124 +- + block/blk-map.c | 47 +- + block/blk-mq-debugfs.c | 2 - + block/blk-settings.c | 74 +- + block/blk-throttle.c | 2 +- + block/blk.h | 21 - + block/fops.c | 35 +- + block/genhd.c | 4 +- + block/ioctl.c | 48 +- + block/partitions/acorn.c | 4 +- + block/partitions/atari.c | 1 - + block/partitions/core.c | 14 +- + block/partitions/ldm.c | 15 +- + drivers/block/aoe/aoe.h | 2 + + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/aoe/aoedev.c | 4 +- + drivers/block/aoe/aoemain.c | 10 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_main.c | 62 +- + drivers/block/drbd/drbd_nl.c | 127 +- + drivers/block/drbd/drbd_receiver.c | 28 +- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_state.c | 3 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/loop.c | 284 ++--- + drivers/block/loop.h | 1 - + drivers/block/nbd.c | 21 +- + drivers/block/null_blk/main.c | 1 - + drivers/block/null_blk/null_blk.h | 8 +- + drivers/block/pktcdvd.c | 34 +- + drivers/block/rbd.c | 1 - + drivers/block/rnbd/rnbd-clt.c | 20 +- + drivers/block/rnbd/rnbd-srv-dev.h | 8 +- + drivers/block/rnbd/rnbd-srv.c | 5 +- + drivers/block/virtio_blk.c | 2 - + drivers/block/xen-blkback/blkback.c | 15 +- + drivers/block/xen-blkback/xenbus.c | 9 +- + drivers/block/xen-blkfront.c | 8 +- + drivers/block/zram/zram_drv.c | 35 +- + drivers/md/bcache/alloc.c | 2 +- + drivers/md/bcache/debug.c | 10 +- + drivers/md/bcache/request.c | 4 +- + drivers/md/bcache/super.c | 3 +- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/dm-bufio.c | 9 +- + drivers/md/dm-cache-target.c | 9 +- + drivers/md/dm-clone-target.c | 9 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-log-writes.c | 3 +- + drivers/md/dm-raid.c | 9 +- + drivers/md/dm-table.c | 25 +- + drivers/md/dm-thin.c | 15 +- + drivers/md/dm.c | 3 +- + drivers/md/md-bitmap.c | 45 +- + drivers/md/md-cluster.c | 2 +- + drivers/md/md-linear.c | 11 +- + drivers/md/md.c | 67 +- + drivers/md/md.h | 62 +- + drivers/md/raid0.c | 38 +- + drivers/md/raid1.c | 73 +- + drivers/md/raid10.c | 81 +- + drivers/md/raid5-cache.c | 8 +- + drivers/md/raid5-ppl.c | 13 +- + drivers/md/raid5.c | 240 ++-- + drivers/md/raid5.h | 23 +- + drivers/mmc/core/queue.c | 3 +- + drivers/mtd/mtd_blkdevs.c | 1 - + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/fc.c | 26 +- + drivers/nvme/target/io-cmd-bdev.c | 2 +- + drivers/nvme/target/zns.c | 3 +- + drivers/s390/block/dasd_fba.c | 1 - + drivers/scsi/lpfc/lpfc_scsi.c | 4 +- + drivers/scsi/sd.c | 2 - + drivers/target/target_core_device.c | 20 +- + drivers/target/target_core_file.c | 10 +- + drivers/target/target_core_iblock.c | 17 +- + drivers/target/target_core_pscsi.c | 36 +- + fs/btrfs/disk-io.c | 11 +- + fs/btrfs/extent-tree.c | 8 +- + fs/btrfs/ioctl.c | 12 +- + fs/btrfs/volumes.c | 15 +- + fs/btrfs/volumes.h | 4 +- + fs/btrfs/zoned.c | 3 +- + fs/direct-io.c | 32 +- + fs/exfat/file.c | 5 +- + fs/exfat/super.c | 10 +- + fs/ext4/ioctl.c | 10 +- + fs/ext4/mballoc.c | 10 +- + fs/ext4/super.c | 10 +- + fs/f2fs/f2fs.h | 3 +- + fs/f2fs/file.c | 19 +- + fs/f2fs/segment.c | 8 +- + fs/fat/file.c | 5 +- + fs/fat/inode.c | 10 +- + fs/gfs2/rgrp.c | 7 +- + fs/internal.h | 29 + + fs/io-wq.c | 4 +- + fs/io-wq.h | 1 + + fs/io_uring.c | 2330 ++++++++++++++++++++++------------ + fs/iomap/direct-io.c | 10 +- + fs/jbd2/journal.c | 9 +- + fs/jfs/ioctl.c | 5 +- + fs/jfs/super.c | 8 +- + fs/nilfs2/ioctl.c | 6 +- + fs/nilfs2/sufile.c | 4 +- + fs/nilfs2/the_nilfs.c | 4 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/super.c | 10 +- + fs/ocfs2/ioctl.c | 5 +- + fs/squashfs/block.c | 20 +- + fs/super.c | 2 +- + fs/xattr.c | 143 ++- + fs/xfs/xfs_discard.c | 8 +- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_super.c | 12 +- + fs/zonefs/super.c | 3 +- + include/linux/backing-dev.h | 6 +- + include/linux/bio.h | 10 +- + include/linux/blk-cgroup.h | 258 +--- + include/linux/blk_types.h | 5 +- + include/linux/blkdev.h | 134 +- + include/linux/blktrace_api.h | 10 +- + include/linux/io_uring.h | 5 + + include/linux/kthread.h | 4 - + include/linux/sched/signal.h | 13 +- + include/linux/socket.h | 1 + + include/linux/task_work.h | 1 + + include/target/target_core_backend.h | 4 +- + include/trace/events/io_uring.h | 85 +- + include/uapi/linux/io_uring.h | 50 +- + kernel/kthread.c | 1 - + kernel/task_work.c | 25 +- + kernel/trace/blktrace.c | 26 +- + mm/backing-dev.c | 19 +- + mm/page_io.c | 4 +- + mm/readahead.c | 1 + + mm/swapfile.c | 32 +- + net/socket.c | 52 +- + 153 files changed, 3508 insertions(+), 2779 deletions(-) + create mode 100644 block/blk-cgroup-fc-appid.c +Merging device-mapper/for-next (e7ea9556985f dm: improve abnormal bio processing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/dm-core.h | 38 ++-- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-flakey.c | 4 +- + drivers/md/dm-linear.c | 11 +- + drivers/md/dm-stats.c | 3 + + drivers/md/dm-table.c | 16 +- + drivers/md/dm-zone.c | 10 - + drivers/md/dm.c | 522 ++++++++++++++++++++++++++++--------------------- + drivers/md/dm.h | 4 +- + 9 files changed, 345 insertions(+), 266 deletions(-) +Merging libata/for-next (0cb63670d505 ata: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 1 + + Documentation/driver-api/libata.rst | 11 ----- + drivers/ata/ahci.c | 5 +- + drivers/ata/libata-core.c | 54 ++-------------------- + drivers/ata/libata-sata.c | 25 ---------- + drivers/ata/libata-scsi.c | 46 +++++++++++++----- + drivers/ata/libata.h | 13 ------ + drivers/ata/pata_mpc52xx.c | 3 +- + drivers/ata/pata_sil680.c | 30 ++++++------ + drivers/ata/pata_via.c | 6 +-- + drivers/ata/sata_gemini.c | 7 +-- + include/linux/libata.h | 3 +- + 12 files changed, 63 insertions(+), 141 deletions(-) +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (ac9d25557dcc mmc: core: Add CIDs for cards to the entropy pool) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 31 ++- + .../bindings/mmc/marvell,dove-sdhci.yaml | 44 ++++ + .../bindings/mmc/marvell,orion-sdio.yaml | 44 ++++ + .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ------------- + .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 +++++++++++++++++++++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 5 +- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 15 +- + .../devicetree/bindings/mmc/orion-sdio.txt | 16 -- + .../devicetree/bindings/mmc/sdhci-am654.yaml | 7 + + .../devicetree/bindings/mmc/sdhci-dove.txt | 14 -- + MAINTAINERS | 3 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boot/romimage/mmcif-sh7724.c | 2 +- + drivers/mmc/core/block.c | 24 +- + drivers/mmc/core/core.c | 7 +- + drivers/mmc/core/mmc.c | 11 +- + drivers/mmc/core/sd.c | 7 + + drivers/mmc/host/bcm2835.c | 2 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/jz4740_mmc.c | 20 ++ + drivers/mmc/host/meson-gx-mmc.c | 21 +- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 2 +- + drivers/mmc/host/mmci.c | 2 + + drivers/mmc/host/mmci_stm32_sdmmc.c | 88 +++++-- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/of_mmc_spi.c | 4 + + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 2 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 76 +++--- + drivers/mmc/host/sdhci-omap.c | 9 +- + drivers/mmc/host/sdhci-pci-gli.c | 10 + + drivers/mmc/host/sdhci.c | 2 +- + drivers/mmc/host/sdhci_am654.c | 23 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 2 +- + drivers/mmc/host/uniphier-sd.c | 2 +- + include/linux/mmc/core.h | 2 +- + include/linux/mmc/host.h | 2 +- + include/linux/{mmc => platform_data}/sh_mmcif.h | 2 - + 40 files changed, 637 insertions(+), 324 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt + rename include/linux/{mmc => platform_data}/sh_mmcif.h (99%) +Merging mfd/for-mfd-next (3474b838f420 dt-bindings: Drop undocumented i.MX iomuxc-gpr bindings in examples) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/syscon.yaml | 8 ------- + Documentation/devicetree/bindings/mux/reg-mux.yaml | 1 - + drivers/mfd/cros_ec_dev.c | 19 +++++++++++++++ + drivers/mfd/hi655x-pmic.c | 27 +++++++--------------- + drivers/mfd/ipaq-micro.c | 2 +- + drivers/mfd/mt6397-core.c | 13 +++++++++++ + include/linux/mfd/hi655x-pmic.h | 4 +++- + include/linux/mfd/mt6359/registers.h | 2 ++ + include/linux/mfd/tps65218.h | 2 +- + 9 files changed, 47 insertions(+), 31 deletions(-) +Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (312310928417 Linux 5.18-rc1) +$ 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 +Already up to date. +Merging regulator/for-next (dae010473785 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6358-regulator.txt | 22 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 2 +- + .../regulator/richtek,rt4801-regulator.yaml | 21 +- + .../regulator/richtek,rt5759-regulator.yaml | 90 +++++ + .../regulator/siliconmitus,sm5703-regulator.yaml | 49 +++ + .../regulator/socionext,uniphier-regulator.yaml | 57 +++- + drivers/regulator/Kconfig | 17 + + drivers/regulator/Makefile | 2 + + drivers/regulator/core.c | 41 ++- + drivers/regulator/da9121-regulator.c | 2 + + drivers/regulator/fixed.c | 5 +- + drivers/regulator/mt6358-regulator.c | 213 +++++++++++- + drivers/regulator/rpi-panel-attiny-regulator.c | 1 - + drivers/regulator/rt4801-regulator.c | 49 ++- + drivers/regulator/rt5759-regulator.c | 369 +++++++++++++++++++++ + drivers/regulator/sm5703-regulator.c | 167 ++++++++++ + drivers/regulator/stm32-vrefbuf.c | 30 +- + include/linux/regulator/mt6358-regulator.h | 45 +++ + 18 files changed, 1097 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5759-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/siliconmitus,sm5703-regulator.yaml + create mode 100644 drivers/regulator/rt5759-regulator.c + create mode 100644 drivers/regulator/sm5703-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 34 ++++++------ + security/apparmor/procattr.c | 2 +- + 15 files changed, 234 insertions(+), 141 deletions(-) +Merging integrity/next-integrity (891163adf180 ima: remove the IMA_TEMPLATE Kconfig option) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/Kconfig | 14 ++++++-------- + security/integrity/ima/ima_main.c | 2 +- + 2 files changed, 7 insertions(+), 9 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (6a9e261cbbee selinux: don't sleep when CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE is true) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/avc.c | 4 ++-- + security/selinux/hooks.c | 5 +++-- + security/selinux/include/security.h | 4 ++++ + security/selinux/selinuxfs.c | 8 ++++++-- + security/selinux/ss/services.c | 1 - + 5 files changed, 15 insertions(+), 7 deletions(-) +Merging smack/next (ba6b652bd863 smack: Remove redundant assignments) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smackfs.c +Merge made by the 'ort' strategy. + security/smack/smackfs.c | 1 - + 1 file changed, 1 deletion(-) +Merging tomoyo/master (3a321335572d workqueue: Warn flushing of kernel-global workqueues) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 15 +++------------ + kernel/workqueue.c | 36 +++++++++++++++++++++++++++++------- + 2 files changed, 32 insertions(+), 19 deletions(-) +Merging tpmdd/next (fad7eba9464e certs: Explain the rationale to call panic()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Auto-merging MAINTAINERS +Auto-merging certs/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + certs/.gitignore | 1 + + certs/Kconfig | 17 +- + certs/Makefile | 14 +- + certs/blacklist.c | 227 ++++++++++++++++----- + crypto/asymmetric_keys/x509_public_key.c | 3 +- + include/keys/system_keyring.h | 14 +- + scripts/check-blacklist-hashes.awk | 37 ++++ + .../integrity/platform_certs/keyring_handler.c | 26 +-- + tools/certs/print-cert-tbs-hash.sh | 91 +++++++++ + 10 files changed, 352 insertions(+), 80 deletions(-) + create mode 100755 scripts/check-blacklist-hashes.awk + create mode 100755 tools/certs/print-cert-tbs-hash.sh +Merging watchdog/master (672c0c517342 Linux 5.18-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 (85613addc0be Merge branches 'apple/dart', 'arm/msm', 'iommu/fixes', 'ppc/pamu', 'x86/amd', 'vfio-notifier-fix' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging MAINTAINERS +Auto-merging drivers/iommu/amd/init.c +Auto-merging drivers/iommu/amd/iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging include/linux/pci.h +Resolved 'drivers/iommu/amd/iommu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d16b7bef4dc] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 10 - + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 10 - + MAINTAINERS | 10 +- + drivers/amba/bus.c | 37 ++- + drivers/base/dd.c | 5 + + drivers/base/platform.c | 21 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 24 +- + drivers/iommu/amd/amd_iommu_types.h | 4 + + drivers/iommu/amd/init.c | 6 +- + drivers/iommu/amd/iommu.c | 19 +- + drivers/iommu/amd/iommu_v2.c | 12 +- + drivers/iommu/apple-dart.c | 9 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 9 +- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 30 +++ + drivers/iommu/dma-iommu.c | 5 + + drivers/iommu/fsl_pamu.c | 3 + + drivers/iommu/fsl_pamu_domain.c | 1 + + drivers/iommu/intel/iommu.c | 46 +++- + drivers/iommu/intel/svm.c | 4 + + drivers/iommu/iommu.c | 251 +++++++++++++------- + drivers/iommu/msm_iommu.c | 11 +- + drivers/pci/pci-driver.c | 18 ++ + drivers/pci/pci-stub.c | 1 + + drivers/pci/pcie/portdrv_pci.c | 2 + + drivers/thunderbolt/domain.c | 12 +- + drivers/thunderbolt/nhi.c | 44 ++++ + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 + + drivers/vfio/pci/vfio_pci.c | 1 + + drivers/vfio/platform/vfio_amba.c | 1 + + drivers/vfio/platform/vfio_platform.c | 1 + + drivers/vfio/vfio.c | 252 ++------------------- + drivers/vfio/vfio_iommu_type1.c | 30 ++- + include/linux/amba/bus.h | 8 + + include/linux/device/bus.h | 3 + + include/linux/fsl/mc.h | 8 + + include/linux/intel-iommu.h | 2 +- + include/linux/iommu.h | 69 ++++-- + include/linux/pci.h | 8 + + include/linux/platform_device.h | 10 +- + include/linux/thunderbolt.h | 2 + + 40 files changed, 582 insertions(+), 418 deletions(-) +Merging audit/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (4fb74186cee8 of: overlay: do not free changeset when of_overlay_apply returns error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml +Auto-merging Documentation/devicetree/bindings/hwmon/adt7475.yaml +Auto-merging Documentation/devicetree/bindings/i2c/samsung,s3c2410-i2c.yaml +Auto-merging Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml +Auto-merging Documentation/devicetree/bindings/leds/leds-mt6360.yaml +Auto-merging Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml +Auto-merging Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml +Auto-merging Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/property.c +Merge made by the 'ort' strategy. + .../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 19 -- + .../bindings/arm/freescale/fsl,layerscape-scfg.txt | 19 -- + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 35 --- + .../bindings/arm/mediatek/mediatek,infracfg.txt | 42 --- + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 81 +++++ + .../bindings/arm/mediatek/mediatek,topckgen.txt | 35 --- + .../bindings/clock/mediatek,apmixedsys.yaml | 61 ++++ + .../bindings/clock/mediatek,topckgen.yaml | 61 ++++ + .../clock/samsung,exynos4412-isp-clock.yaml | 1 - + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 8 + + .../bindings/crypto/allwinner,sun8i-ce.yaml | 1 - + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 - + .../display/bridge/google,cros-ec-anx7688.yaml | 1 - + .../devicetree/bindings/display/bridge/ps8640.yaml | 1 - + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 1 - + .../bindings/display/mediatek/mediatek,merge.yaml | 1 - + .../bindings/display/panel/ilitek,ili9341.yaml | 1 - + .../bindings/display/panel/orisetech,otm8009a.yaml | 1 - + .../display/sprd/sprd,display-subsystem.yaml | 1 - + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 1 - + Documentation/devicetree/bindings/eeprom/at24.txt | 1 - + Documentation/devicetree/bindings/eeprom/at24.yaml | 4 +- + .../devicetree/bindings/example-schema.yaml | 14 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 69 +++++ + .../devicetree/bindings/gnss/mediatek.txt | 35 --- + .../devicetree/bindings/gnss/mediatek.yaml | 59 ++++ + .../devicetree/bindings/gpu/samsung-rotator.yaml | 1 - + .../devicetree/bindings/hwmon/adt7475.yaml | 1 - + .../devicetree/bindings/i2c/i2c-gate.yaml | 1 - + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 53 ---- + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 118 +++++++ + .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 1 - + .../devicetree/bindings/i2c/renesas,riic.yaml | 2 + + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 1 - + .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml | 2 +- + .../interrupt-controller/fsl,ls-extirq.txt | 53 ---- + .../interrupt-controller/fsl,ls-extirq.yaml | 118 +++++++ + .../bindings/interrupt-controller/qcom,pdc.txt | 5 +- + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 1 - + .../bindings/leds/backlight/qcom-wled.yaml | 2 +- + .../devicetree/bindings/leds/leds-mt6360.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 1 - + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 12 +- + .../devicetree/bindings/media/microchip,xisc.yaml | 1 - + .../devicetree/bindings/mfd/mediatek,mt6360.yaml | 67 ++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 +- + Documentation/devicetree/bindings/mtd/common.txt | 1 - + .../bindings/mtd/hisilicon,fmc-spi-nor.txt | 2 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 7 + + .../devicetree/bindings/net/smsc,lan91c111.yaml | 61 ++++ + .../devicetree/bindings/net/smsc-lan91c111.txt | 17 -- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 - + .../bindings/net/wireless/qcom,ath11k.yaml | 2 +- + .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 4 + + .../bindings/pci/socionext,uniphier-pcie.yaml | 96 ++++++ + .../devicetree/bindings/pci/uniphier-pcie.txt | 82 ----- + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 - + .../bindings/power/renesas,rcar-sysc.yaml | 15 +- + .../bindings/power/supply/cw2015_battery.yaml | 1 - + .../bindings/power/supply/power-supply.yaml | 1 - + .../bindings/power/supply/ti,lp8727.yaml | 1 - + .../bindings/power/supply/tps65217-charger.yaml | 2 +- + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +- + .../regulator/socionext,uniphier-regulator.yaml | 1 - + .../bindings/regulator/st,stm32-vrefbuf.yaml | 1 - + .../bindings/reserved-memory/ramoops.yaml | 1 - + .../bindings/reset/hisilicon,hi6220-reset.txt | 37 --- + .../devicetree/bindings/reset/microchip,rst.yaml | 1 - + .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 1 - + Documentation/devicetree/bindings/rtc/rtc.txt | 1 - + .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 81 ----- + .../bindings/serial/qcom,msm-uartdm.yaml | 112 +++++++ + .../devicetree/bindings/serial/sprd-uart.yaml | 2 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 1 - + .../bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 68 +++++ + .../bindings/soc/fsl/fsl,layerscape-scfg.yaml | 58 ++++ + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 3 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + .../devicetree/bindings/soc/ti/wkup-m3-ipc.yaml | 175 +++++++++++ + .../devicetree/bindings/soc/ti/wkup_m3_ipc.txt | 57 ---- + .../devicetree/bindings/sound/adi,adau1372.yaml | 1 - + .../bindings/sound/amlogic,gx-sound-card.yaml | 1 - + .../devicetree/bindings/sound/maxim,max98520.yaml | 1 - + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 1 - + .../bindings/sound/samsung,aries-wm8994.yaml | 1 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 1 - + .../devicetree/bindings/sound/tas2562.yaml | 1 - + .../devicetree/bindings/sound/tas2770.yaml | 1 - + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 1 - + .../bindings/spi/amlogic,meson6-spifc.yaml | 1 - + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 +- + .../devicetree/bindings/spi/qcom,spi-qup.txt | 103 ------- + .../devicetree/bindings/spi/qcom,spi-qup.yaml | 81 +++++ + .../devicetree/bindings/spi/renesas,hspi.yaml | 1 - + .../devicetree/bindings/spi/spi-davinci.txt | 2 +- + .../devicetree/bindings/spi/spi-pl022.yaml | 2 +- + .../bindings/spmi/qcom,spmi-pmic-arb.txt | 65 ---- + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 117 +++++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/timer/renesas,ostm.yaml | 2 + + .../devicetree/bindings/timer/ti,timer-dm.yaml | 152 +++++++++ + .../devicetree/bindings/timer/ti,timer.txt | 44 --- + .../devicetree/bindings/trivial-devices.yaml | 4 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 4 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 5 + + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/writing-bindings.rst | 25 ++ + .../devicetree/bindings/writing-schema.rst | 8 + + Documentation/devicetree/overlay-notes.rst | 30 +- + MAINTAINERS | 4 +- + drivers/of/irq.c | 13 +- + drivers/of/overlay.c | 339 ++++++++++----------- + drivers/of/platform.c | 14 +- + drivers/of/property.c | 5 +- + drivers/of/unittest-data/Makefile | 10 + + drivers/of/unittest-data/overlay_16.dts | 15 + + drivers/of/unittest-data/overlay_17.dts | 15 + + drivers/of/unittest-data/overlay_18.dts | 15 + + drivers/of/unittest-data/overlay_19.dts | 15 + + drivers/of/unittest-data/overlay_20.dts | 15 + + drivers/of/unittest.c | 201 ++++++++++++ + include/linux/of.h | 16 +- + 128 files changed, 2181 insertions(+), 1062 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-scfg.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml + delete mode 100644 Documentation/devicetree/bindings/eeprom/at24.txt + create mode 100644 Documentation/devicetree/bindings/gnss/brcm,bcm4751.yaml + delete mode 100644 Documentation/devicetree/bindings/gnss/mediatek.txt + create mode 100644 Documentation/devicetree/bindings/gnss/mediatek.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6360.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/common.txt + create mode 100644 Documentation/devicetree/bindings/net/smsc,lan91c111.yaml + delete mode 100644 Documentation/devicetree/bindings/net/smsc-lan91c111.txt + create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt + delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc.txt + delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt + create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-scfg.yaml + create mode 100644 Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/ti/wkup_m3_ipc.txt + delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt + create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml + delete mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt + create mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.yaml + create mode 100644 Documentation/devicetree/bindings/timer/ti,timer-dm.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/ti,timer.txt + create mode 100644 drivers/of/unittest-data/overlay_16.dts + create mode 100644 drivers/of/unittest-data/overlay_17.dts + create mode 100644 drivers/of/unittest-data/overlay_18.dts + create mode 100644 drivers/of/unittest-data/overlay_19.dts + create mode 100644 drivers/of/unittest-data/overlay_20.dts +Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186) +$ 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 (4b939e3a3e91 Merge remote-tracking branch 'spi/for-5.19' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/spi/spi-imx.c +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/ingenic,spi.yaml | 3 + + .../bindings/spi/mediatek,spi-mt65xx.yaml | 4 + + .../bindings/spi/mediatek,spi-mtk-snfi.yaml | 88 ++ + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 1 + + drivers/spi/Kconfig | 14 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 6 - + drivers/spi/spi-cadence-quadspi.c | 144 +- + drivers/spi/spi-cadence.c | 8 +- + drivers/spi/spi-clps711x.c | 5 +- + drivers/spi/spi-img-spfi.c | 2 +- + drivers/spi/spi-imx.c | 38 +- + drivers/spi/spi-ingenic.c | 47 +- + drivers/spi/spi-intel.c | 51 +- + drivers/spi/spi-mem.c | 3 +- + drivers/spi/spi-mpc52xx-psc.c | 1 + + drivers/spi/spi-mpc52xx.c | 3 + + drivers/spi/spi-mt65xx.c | 702 +++++++--- + drivers/spi/spi-mtk-snfi.c | 1470 ++++++++++++++++++++ + drivers/spi/spi-mxs.c | 3 +- + drivers/spi/spi-omap2-mcspi.c | 13 +- + drivers/spi/spi-rockchip.c | 8 + + drivers/spi/spi-rspi.c | 15 +- + drivers/spi/spi-sprd.c | 3 +- + drivers/spi/spi-stm32-qspi.c | 30 +- + drivers/spi/spi-stm32.c | 3 +- + drivers/spi/spi-sunplus-sp7021.c | 6 - + drivers/spi/spi-tegra114.c | 9 +- + drivers/spi/spi-tegra20-sflash.c | 6 +- + drivers/spi/spi-tegra20-slink.c | 6 +- + drivers/spi/spi-ti-qspi.c | 8 +- + drivers/spi/spi.c | 25 +- + drivers/spi/spidev.c | 104 +- + include/uapi/linux/spi/spi.h | 3 +- + 34 files changed, 2363 insertions(+), 470 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mtk-snfi.yaml + create mode 100644 drivers/spi/spi-mtk-snfi.c +Merging tip/master (aea1ae1ab93e Merge x86/cpu into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/x86/index.rst +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm64/kernel/entry-common.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/mm/mem_encrypt_amd.c +Auto-merging drivers/acpi/processor_idle.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/efi.h +Auto-merging include/linux/sched/signal.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging scripts/Makefile.build +Auto-merging tools/objtool/Makefile +Auto-merging tools/objtool/check.c +Resolved 'Documentation/admin-guide/kernel-parameters.txt' 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 b80ed10c5d76] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/accounting/psi.rst | 9 +- + Documentation/admin-guide/kernel-parameters.txt | 26 +- + Documentation/core-api/timekeeping.rst | 1 + + Documentation/process/maintainer-tip.rst | 14 + + Documentation/virt/coco/sev-guest.rst | 155 ++++ + Documentation/virt/index.rst | 1 + + Documentation/x86/cpuinfo.rst | 5 +- + Documentation/x86/index.rst | 1 + + Documentation/x86/tdx.rst | 218 ++++++ + Documentation/x86/x86_64/boot-options.rst | 23 +- + Documentation/x86/zero-page.rst | 2 + + MAINTAINERS | 12 +- + Makefile | 2 +- + arch/Kconfig | 18 +- + arch/arm/kernel/signal.c | 1 + + arch/arm64/kernel/entry-common.c | 8 +- + arch/arm64/kernel/signal.c | 1 + + arch/arm64/kernel/signal32.c | 1 + + arch/m68k/kernel/signal.c | 1 + + arch/powerpc/kernel/fadump.c | 2 +- + arch/powerpc/platforms/powernv/opal-core.c | 2 +- + arch/sparc/kernel/signal32.c | 1 + + arch/sparc/kernel/signal_64.c | 1 + + arch/x86/Kconfig | 53 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/Makefile | 1 + + arch/x86/boot/boot.h | 37 +- + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/compressed/acpi.c | 176 +---- + arch/x86/boot/compressed/early_serial_console.c | 3 +- + arch/x86/boot/compressed/efi.c | 234 ++++++ + arch/x86/boot/compressed/efi.h | 126 +++ + arch/x86/boot/compressed/head_64.S | 64 +- + arch/x86/boot/compressed/ident_map_64.c | 39 +- + arch/x86/boot/compressed/idt_64.c | 18 +- + arch/x86/boot/compressed/kaslr.c | 3 +- + arch/x86/boot/compressed/mem_encrypt.S | 36 - + arch/x86/boot/compressed/misc.c | 17 +- + arch/x86/boot/compressed/misc.h | 60 +- + arch/x86/boot/compressed/pgtable.h | 2 +- + arch/x86/boot/compressed/pgtable_64.c | 3 +- + arch/x86/boot/compressed/sev.c | 263 ++++++- + arch/x86/boot/compressed/tdcall.S | 3 + + arch/x86/boot/compressed/tdx.c | 77 ++ + arch/x86/boot/compressed/tdx.h | 13 + + arch/x86/boot/cpucheck.c | 30 +- + arch/x86/boot/cpuflags.c | 3 +- + arch/x86/boot/cpuflags.h | 1 + + arch/x86/boot/io.h | 41 + + arch/x86/boot/main.c | 4 + + arch/x86/boot/msr.h | 26 + + arch/x86/coco/Makefile | 2 + + arch/x86/coco/core.c | 25 +- + arch/x86/coco/tdx/Makefile | 3 + + arch/x86/coco/tdx/tdcall.S | 205 +++++ + arch/x86/coco/tdx/tdx.c | 692 +++++++++++++++++ + arch/x86/events/Kconfig | 8 + + arch/x86/events/amd/Makefile | 1 + + arch/x86/events/amd/brs.c | 364 +++++++++ + arch/x86/events/amd/core.c | 252 +++++- + arch/x86/events/core.c | 19 +- + arch/x86/events/intel/lbr.c | 36 +- + arch/x86/events/perf_event.h | 143 +++- + arch/x86/ia32/Makefile | 2 - + arch/x86/ia32/ia32_aout.c | 325 -------- + arch/x86/include/asm/acenv.h | 14 +- + arch/x86/include/asm/amd_nb.h | 1 - + arch/x86/include/asm/apic.h | 7 + + arch/x86/include/asm/apicdef.h | 6 - + arch/x86/include/asm/bootparam_utils.h | 1 + + arch/x86/include/asm/cpu.h | 4 +- + arch/x86/include/asm/cpu_entry_area.h | 2 +- + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 4 +- + arch/x86/include/asm/cpuid.h | 34 + + arch/x86/include/asm/disabled-features.h | 16 +- + arch/x86/include/asm/elf.h | 15 +- + arch/x86/include/asm/idtentry.h | 4 + + arch/x86/include/asm/io.h | 42 +- + arch/x86/include/asm/jump_label.h | 6 +- + arch/x86/include/asm/kvm_para.h | 22 + + arch/x86/include/asm/mem_encrypt.h | 6 +- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/msr-index.h | 6 + + arch/x86/include/asm/msr.h | 11 +- + arch/x86/include/asm/page_64.h | 2 +- + arch/x86/include/asm/pci_x86.h | 9 + + arch/x86/include/asm/perf_event.h | 23 + + arch/x86/include/asm/pkeys.h | 8 - + arch/x86/include/asm/proto.h | 1 - + arch/x86/include/asm/realmode.h | 1 + + arch/x86/include/asm/segment.h | 12 - + arch/x86/include/asm/setup.h | 1 - + arch/x86/include/asm/sev-common.h | 82 ++ + arch/x86/include/asm/sev.h | 137 +++- + arch/x86/include/asm/shared/io.h | 34 + + arch/x86/include/asm/shared/msr.h | 15 + + arch/x86/include/asm/shared/tdx.h | 40 + + arch/x86/include/asm/smap.h | 24 - + arch/x86/include/asm/special_insns.h | 7 +- + arch/x86/include/asm/suspend_32.h | 2 +- + arch/x86/include/asm/suspend_64.h | 12 +- + arch/x86/include/asm/svm.h | 179 ++++- + arch/x86/include/asm/tdx.h | 91 +++ + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/topology.h | 17 +- + arch/x86/include/uapi/asm/bootparam.h | 4 +- + arch/x86/include/uapi/asm/svm.h | 13 + + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/acpi/boot.c | 93 ++- + arch/x86/kernel/acpi/cppc.c | 29 +- + arch/x86/kernel/alternative.c | 6 +- + arch/x86/kernel/amd_nb.c | 7 +- + arch/x86/kernel/apic/apic.c | 21 +- + arch/x86/kernel/apic/io_apic.c | 18 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 16 +- + arch/x86/kernel/asm-offsets.c | 17 + + arch/x86/kernel/cpu/aperfmperf.c | 480 +++++++++--- + arch/x86/kernel/cpu/bugs.c | 7 + + arch/x86/kernel/cpu/common.c | 105 +-- + arch/x86/kernel/cpu/intel.c | 75 +- + arch/x86/kernel/cpu/mce/amd.c | 32 +- + arch/x86/kernel/cpu/mce/core.c | 4 +- + arch/x86/kernel/cpu/mce/severity.c | 110 ++- + arch/x86/kernel/cpu/proc.c | 11 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 14 +- + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 58 +- + arch/x86/kernel/fpu/xstate.h | 14 +- + arch/x86/kernel/head64.c | 36 +- + arch/x86/kernel/head_64.S | 65 +- + arch/x86/kernel/idt.c | 3 + + arch/x86/kernel/probe_roms.c | 13 +- + arch/x86/kernel/process.c | 14 +- + arch/x86/kernel/process_32.c | 11 +- + arch/x86/kernel/ptrace.c | 6 +- + arch/x86/kernel/setup.c | 28 +- + arch/x86/kernel/sev-shared.c | 529 ++++++++++++- + arch/x86/kernel/sev.c | 852 ++++++++++++++++++++- + arch/x86/kernel/signal.c | 8 +- + arch/x86/kernel/signal_compat.c | 2 + + arch/x86/kernel/smpboot.c | 373 +-------- + arch/x86/kernel/traps.c | 143 +++- + arch/x86/kernel/vm86_32.c | 4 +- + arch/x86/kvm/cpuid.c | 19 +- + arch/x86/kvm/svm/sev.c | 22 +- + arch/x86/kvm/svm/svm.c | 8 +- + arch/x86/kvm/svm/svm.h | 4 +- + arch/x86/lib/delay.c | 4 +- + arch/x86/lib/insn-eval.c | 5 +- + arch/x86/lib/kaslr.c | 2 +- + arch/x86/math-emu/get_address.c | 2 +- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/amdtopology.c | 2 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/ioremap.c | 5 + + arch/x86/mm/mem_encrypt.c | 13 +- + arch/x86/mm/mem_encrypt_amd.c | 71 +- + arch/x86/mm/mem_encrypt_identity.c | 8 + + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/numa_emulation.c | 4 +- + arch/x86/mm/setup_nx.c | 62 -- + arch/x86/pci/irq.c | 377 +++++++-- + arch/x86/platform/uv/uv_nmi.c | 23 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/realmode/rm/header.S | 1 + + arch/x86/realmode/rm/trampoline_64.S | 57 +- + arch/x86/realmode/rm/trampoline_common.S | 12 +- + arch/x86/realmode/rm/wakemain.c | 4 + + arch/x86/virt/vmx/tdx/tdxcall.S | 96 +++ + arch/x86/xen/smp_pv.c | 5 +- + drivers/acpi/acpi_pad.c | 7 + + drivers/acpi/processor_idle.c | 5 + + drivers/char/agp/amd64-agp.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/irqchip/irq-bcm6345-l1.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/virt/Kconfig | 3 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/sev-guest/Kconfig | 14 + + drivers/virt/coco/sev-guest/Makefile | 2 + + drivers/virt/coco/sev-guest/sev-guest.c | 743 ++++++++++++++++++ + drivers/virt/coco/sev-guest/sev-guest.h | 63 ++ + fs/proc/cpuinfo.c | 6 +- + include/linux/bpf.h | 2 + + include/linux/cc_platform.h | 18 + + include/linux/compat.h | 1 + + include/linux/compiler.h | 6 +- + include/linux/cpufreq.h | 1 - + include/linux/efi.h | 1 + + include/linux/elfcore.h | 9 - + include/linux/instrumentation.h | 6 +- + include/linux/irqflags.h | 4 +- + include/linux/kvm_host.h | 2 +- + include/linux/objtool.h | 6 +- + include/linux/perf_event.h | 22 + + include/linux/sched.h | 44 ++ + include/linux/sched/signal.h | 2 +- + include/linux/sched/task_stack.h | 2 +- + include/linux/timekeeping.h | 1 + + include/linux/timer.h | 8 - + include/trace/events/lock.h | 63 +- + include/trace/events/timer.h | 5 +- + include/uapi/asm-generic/siginfo.h | 7 + + include/uapi/linux/sev-guest.h | 80 ++ + kernel/configs/x86_debug.config | 18 + + kernel/cpu.c | 29 +- + kernel/entry/common.c | 6 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 5 + + kernel/irq/affinity.c | 2 +- + kernel/irq/manage.c | 31 +- + kernel/irq/matrix.c | 2 +- + kernel/irq/msi.c | 15 + + kernel/kcsan/kcsan_test.c | 5 +- + kernel/kexec_core.c | 2 +- + kernel/locking/lockdep.c | 23 +- + kernel/locking/mutex.c | 18 +- + kernel/locking/percpu-rwsem.c | 5 + + kernel/locking/qrwlock.c | 9 + + kernel/locking/qspinlock.c | 5 + + kernel/locking/rtmutex.c | 11 + + kernel/locking/rwbase_rt.c | 7 + + kernel/locking/rwsem.c | 130 ++-- + kernel/locking/semaphore.c | 15 +- + kernel/sched/core.c | 12 + + kernel/sched/fair.c | 17 +- + kernel/sched/idle.c | 2 +- + kernel/sched/pelt.h | 4 +- + kernel/sched/psi.c | 18 +- + kernel/sched/sched.h | 4 +- + kernel/signal.c | 18 +- + kernel/smpboot.c | 7 + + kernel/sysctl.c | 11 - + kernel/time/clockevents.c | 9 +- + kernel/time/clocksource.c | 2 +- + kernel/time/tick-sched.c | 12 +- + kernel/time/timekeeping.c | 17 + + kernel/time/timer.c | 56 +- + kernel/trace/Kconfig | 1 + + kernel/trace/trace.c | 14 +- + kernel/trace/trace_preemptirq.c | 4 +- + lib/Kconfig.debug | 22 +- + lib/Kconfig.kcsan | 4 +- + lib/Kconfig.ubsan | 2 +- + lib/irq_poll.c | 8 +- + scripts/Makefile.build | 25 +- + scripts/link-vmlinux.sh | 64 +- + scripts/package/builddeb | 2 +- + tools/arch/x86/include/asm/disabled-features.h | 8 +- + tools/include/linux/objtool.h | 6 +- + tools/lib/subcmd/parse-options.c | 17 +- + tools/objtool/Build | 12 +- + .../{stack-validation.txt => objtool.txt} | 122 ++- + tools/objtool/Makefile | 8 +- + tools/objtool/arch/x86/decode.c | 2 +- + tools/objtool/arch/x86/special.c | 2 +- + tools/objtool/builtin-check.c | 156 +++- + tools/objtool/builtin-orc.c | 73 -- + tools/objtool/check.c | 454 ++++++----- + tools/objtool/elf.c | 11 +- + tools/objtool/include/objtool/builtin.h | 34 +- + tools/objtool/include/objtool/elf.h | 12 +- + tools/objtool/include/objtool/warn.h | 35 +- + tools/objtool/objtool.c | 103 +-- + tools/objtool/weak.c | 9 +- + 268 files changed, 9108 insertions(+), 2648 deletions(-) + create mode 100644 Documentation/virt/coco/sev-guest.rst + create mode 100644 Documentation/x86/tdx.rst + create mode 100644 arch/x86/boot/compressed/efi.c + create mode 100644 arch/x86/boot/compressed/efi.h + create mode 100644 arch/x86/boot/compressed/tdcall.S + create mode 100644 arch/x86/boot/compressed/tdx.c + create mode 100644 arch/x86/boot/compressed/tdx.h + create mode 100644 arch/x86/boot/io.h + create mode 100644 arch/x86/boot/msr.h + create mode 100644 arch/x86/coco/tdx/Makefile + create mode 100644 arch/x86/coco/tdx/tdcall.S + create mode 100644 arch/x86/coco/tdx/tdx.c + create mode 100644 arch/x86/events/amd/brs.c + delete mode 100644 arch/x86/ia32/ia32_aout.c + create mode 100644 arch/x86/include/asm/cpuid.h + create mode 100644 arch/x86/include/asm/shared/io.h + create mode 100644 arch/x86/include/asm/shared/msr.h + create mode 100644 arch/x86/include/asm/shared/tdx.h + create mode 100644 arch/x86/include/asm/tdx.h + delete mode 100644 arch/x86/mm/setup_nx.c + create mode 100644 arch/x86/virt/vmx/tdx/tdxcall.S + create mode 100644 drivers/virt/coco/sev-guest/Kconfig + create mode 100644 drivers/virt/coco/sev-guest/Makefile + create mode 100644 drivers/virt/coco/sev-guest/sev-guest.c + create mode 100644 drivers/virt/coco/sev-guest/sev-guest.h + create mode 100644 include/uapi/linux/sev-guest.h + create mode 100644 kernel/configs/x86_debug.config + rename tools/objtool/Documentation/{stack-validation.txt => objtool.txt} (80%) + delete mode 100644 tools/objtool/builtin-orc.c +Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()) +$ 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 'ort' strategy. +Merging edac/edac-for-next (cd2ef50eb483 Merge edac-alloc-cleanup into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 - + .../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 - + drivers/edac/Kconfig | 3 +- + drivers/edac/armada_xp_edac.c | 18 +- + drivers/edac/dmc520_edac.c | 2 +- + drivers/edac/edac_device.c | 130 +++++-------- + drivers/edac/edac_device.h | 14 ++ + drivers/edac/edac_device_sysfs.c | 5 +- + drivers/edac/edac_mc.c | 96 ++-------- + drivers/edac/edac_module.h | 2 - + drivers/edac/edac_pci.c | 25 ++- + drivers/edac/ghes_edac.c | 202 ++++----------------- + drivers/edac/mpc85xx_edac.c | 14 -- + drivers/edac/synopsys_edac.c | 59 +++--- + drivers/firmware/efi/cper.c | 64 +++++-- + include/linux/cper.h | 3 + + 16 files changed, 208 insertions(+), 441 deletions(-) +Merging irqchip/irq/irqchip-next (4bde53ab3370 Merge branch irq/gpio-immutable into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + Documentation/driver-api/gpio/driver.rst | 175 +++++++++++++++++++++++++------ + drivers/gpio/TODO | 19 ++++ + drivers/gpio/gpio-pl061.c | 32 ++++-- + drivers/gpio/gpio-tegra186.c | 32 ++++-- + drivers/gpio/gpiolib.c | 13 ++- + drivers/pinctrl/pinctrl-amd.c | 11 +- + drivers/pinctrl/pinctrl-apple-gpio.c | 29 ++--- + drivers/pinctrl/qcom/pinctrl-msm.c | 53 ++++++---- + include/linux/gpio/driver.h | 16 +++ + include/linux/irq.h | 2 + + kernel/irq/debugfs.c | 1 + + 11 files changed, 293 insertions(+), 90 deletions(-) +Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging include/linux/trace_events.h +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_events_hist.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (4ccb27d8a0f2 rcutorture: Simplify rcu_torture_read_exit_child() loop) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/smp.c +Auto-merging kernel/trace/Kconfig +Auto-merging tools/Makefile +Merge made by the 'ort' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../Expedited-Grace-Periods.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 36 +- + Documentation/RCU/arrayRCU.rst | 4 +- + Documentation/RCU/checklist.rst | 9 +- + Documentation/RCU/rcu.rst | 13 +- + Documentation/RCU/rculist_nulls.rst | 2 +- + Documentation/RCU/stallwarn.rst | 18 + + Documentation/RCU/whatisRCU.rst | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 115 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + arch/Kconfig | 1 + + include/linux/rcupdate.h | 2 + + include/linux/rcutiny.h | 10 + + include/linux/rcutree.h | 2 + + include/linux/srcutree.h | 32 +- + include/linux/torture.h | 2 +- + kernel/bpf/Kconfig | 1 + + kernel/rcu/Kconfig | 86 +- + kernel/rcu/Kconfig.debug | 22 +- + kernel/rcu/rcu.h | 28 +- + kernel/rcu/rcu_segcblist.c | 8 +- + kernel/rcu/rcuscale.c | 22 +- + kernel/rcu/rcutorture.c | 335 ++- + kernel/rcu/refscale.c | 22 +- + kernel/rcu/srcutree.c | 639 +++-- + kernel/rcu/sync.c | 2 +- + kernel/rcu/tasks.h | 174 +- + kernel/rcu/tiny.c | 11 +- + kernel/rcu/tree.c | 262 +- + kernel/rcu/tree.h | 20 +- + kernel/rcu/tree_exp.h | 254 +- + kernel/rcu/tree_nocb.h | 278 ++- + kernel/rcu/tree_plugin.h | 34 +- + kernel/rcu/tree_stall.h | 83 +- + kernel/rcu/update.c | 15 + + kernel/scftorture.c | 5 +- + kernel/smp.c | 7 +- + kernel/trace/Kconfig | 1 + + tools/Makefile | 4 + + tools/include/nolibc/Makefile | 42 + + tools/include/nolibc/arch-aarch64.h | 199 ++ + tools/include/nolibc/arch-arm.h | 204 ++ + tools/include/nolibc/arch-i386.h | 219 ++ + tools/include/nolibc/arch-mips.h | 215 ++ + tools/include/nolibc/arch-riscv.h | 204 ++ + tools/include/nolibc/arch-x86_64.h | 215 ++ + 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 | 306 +++ + tools/include/nolibc/stdlib.h | 423 ++++ + tools/include/nolibc/string.h | 285 +++ + tools/include/nolibc/sys.h | 1247 ++++++++++ + tools/include/nolibc/time.h | 28 + + tools/include/nolibc/types.h | 205 ++ + tools/include/nolibc/unistd.h | 54 + + tools/memory-model/Documentation/locking.txt | 320 +++ + tools/memory-model/linux-kernel.bell | 16 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 + + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 7 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 15 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 10 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 29 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 2 + + .../selftests/rcutorture/configs/rcu/TASKS01 | 1 + + .../selftests/rcutorture/configs/rcu/TASKS02 | 4 + + .../selftests/rcutorture/configs/rcu/TASKS02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 3 + + .../selftests/rcutorture/configs/rcu/TRACE02 | 2 + + .../selftests/rcutorture/configs/rcu/TREE04 | 5 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 + + .../selftests/rcutorture/configs/rcu/TREE09 | 2 + + .../selftests/rcutorture/configs/rcu/TREE10 | 1 + + .../rcutorture/configs/rcu/ver_functions.sh | 16 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 7 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 + + .../selftests/rcutorture/configs/refscale/CFcommon | 4 + + .../rcutorture/configs/refscale/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/PREEMPT | 1 + + .../rcutorture/configs/scf/ver_functions.sh | 3 +- + 107 files changed, 7058 insertions(+), 3285 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/Makefile + 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 (71d7c575a673 Merge branch 'kvm-fixes-for-5.18-rc5' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/x86/include/asm/kvm-x86-ops.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/kvm.c +Auto-merging arch/x86/kvm/pmu.h +Auto-merging arch/x86/kvm/svm/pmu.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/vmx/pmu_intel.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging init/Kconfig +Auto-merging tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 152 ++- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm-x86-pmu-ops.h | 31 + + arch/x86/include/asm/kvm_host.h | 68 +- + arch/x86/include/asm/uaccess.h | 142 +++ + arch/x86/include/asm/vmx.h | 10 +- + arch/x86/include/uapi/asm/kvm.h | 11 +- + arch/x86/kernel/asm-offsets_64.c | 4 +- + arch/x86/kernel/kvm.c | 77 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kvm/i8259.c | 1 - + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 18 +- + arch/x86/kvm/mmu/paging_tmpl.h | 49 +- + arch/x86/kvm/pmu.c | 66 +- + arch/x86/kvm/pmu.h | 7 +- + arch/x86/kvm/svm/avic.c | 10 +- + arch/x86/kvm/svm/nested.c | 300 +++-- + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/sev.c | 8 +- + arch/x86/kvm/svm/svm.c | 209 +++- + arch/x86/kvm/svm/svm.h | 53 +- + arch/x86/kvm/vmx/nested.c | 48 +- + arch/x86/kvm/vmx/pmu_intel.c | 2 +- + arch/x86/kvm/vmx/vmcs.h | 5 + + arch/x86/kvm/vmx/vmx.c | 10 +- + arch/x86/kvm/x86.c | 267 +++-- + arch/x86/kvm/xen.c | 1245 ++++++++++++++++---- + arch/x86/kvm/xen.h | 62 +- + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 50 +- + init/Kconfig | 5 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + .../selftests/kvm/x86_64/fix_hypercall_test.c | 170 +++ + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 119 ++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 366 +++++- + 38 files changed, 2883 insertions(+), 705 deletions(-) + create mode 100644 arch/x86/include/asm/kvm-x86-pmu-ops.h + create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +Merging kvm-arm/next (4e6921a2e6c1 Merge branch kvm-arm64/hyp-stack-guard 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 arch/arm64/include/asm/esr.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/handle_exit.c +Auto-merging arch/arm64/kvm/hyp/nvhe/host.S +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/sys_regs.c +Merge made by the 'ort' strategy. + Documentation/arm64/cpu-feature-registers.rst | 2 + + Documentation/arm64/elf_hwcaps.rst | 4 ++ + arch/arm64/include/asm/barrier.h | 4 ++ + arch/arm64/include/asm/esr.h | 8 ++- + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kvm_asm.h | 1 + + arch/arm64/include/asm/kvm_host.h | 1 + + arch/arm64/include/asm/kvm_mmu.h | 3 ++ + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/cpufeature.c | 13 +++++ + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kvm/arch_timer.c | 47 ++++++++++------ + arch/arm64/kvm/arm.c | 43 ++++++++++++--- + arch/arm64/kvm/handle_exit.c | 48 ++++++++++++----- + arch/arm64/kvm/hyp/include/nvhe/mm.h | 6 ++- + arch/arm64/kvm/hyp/nvhe/host.S | 24 +++++++++ + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 18 ++++++- + arch/arm64/kvm/hyp/nvhe/mm.c | 78 +++++++++++++++++---------- + arch/arm64/kvm/hyp/nvhe/setup.c | 31 +++++++++-- + arch/arm64/kvm/hyp/nvhe/switch.c | 7 ++- + arch/arm64/kvm/mmu.c | 68 +++++++++++++++-------- + arch/arm64/kvm/sys_regs.c | 2 + + arch/arm64/lib/delay.c | 12 ++++- + arch/arm64/tools/cpucaps | 1 + + include/kvm/arm_arch_timer.h | 2 - + scripts/kallsyms.c | 3 +- + 26 files changed, 330 insertions(+), 99 deletions(-) +Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) +$ 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 (533bec143a4c arm/xen: Fix some refcount leaks) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86/for-next (b0c07116c894 platform/x86: amd-pmc: Avoid reading SMU version at probe time) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/x86/Kconfig | 8 ++ + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/amd-pmc.c | 78 ++++++++----- + drivers/platform/x86/hp-wmi.c | 8 ++ + drivers/platform/x86/winmate-fm07-keys.c | 189 +++++++++++++++++++++++++++++++ + drivers/platform/x86/wmi.c | 13 +-- + 6 files changed, 261 insertions(+), 38 deletions(-) + create mode 100644 drivers/platform/x86/winmate-fm07-keys.c +Merging chrome-platform/for-next (57b888ca2541 platform/chrome: Re-introduce cros_ec_cmd_xfer and use it for ioctls) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec.c | 36 ++++++++++++--------- + drivers/platform/chrome/cros_ec_chardev.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 50 +++++++++++++++++++++++------ + include/linux/platform_data/cros_ec_proto.h | 6 ++-- + 4 files changed, 65 insertions(+), 29 deletions(-) +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (8d190578f326 ipmi: remove unnecessary type castings) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 5 +- + drivers/char/ipmi/ipmi_ipmb.c | 5 +- + drivers/char/ipmi/ipmi_msghandler.c | 118 ++++++++++++++++++++++++++++++++---- + drivers/char/ipmi/ipmi_poweroff.c | 8 +-- + drivers/char/ipmi/ipmi_si_intf.c | 22 +++---- + drivers/char/ipmi/ipmi_ssif.c | 33 ++++++++-- + drivers/char/ipmi/ipmi_watchdog.c | 28 +++------ + include/linux/ipmi.h | 5 ++ + include/linux/ipmi_smi.h | 6 ++ + 9 files changed, 171 insertions(+), 59 deletions(-) +Merging driver-core/driver-core-next (0e509f537f8d Merge 5.18-rc5 into driver-core-next) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/amba/bus.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/platform.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging drivers/clk/imx/clk-scu.c +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/amba/bus.h +Auto-merging include/linux/fsl/mc.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/platform_device.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-firmware | 77 ++++ + .../ABI/testing/sysfs-devices-physical_location | 42 ++ + Documentation/driver-api/firmware/fw_upload.rst | 126 ++++++ + Documentation/driver-api/firmware/index.rst | 1 + + drivers/amba/bus.c | 28 +- + drivers/base/Makefile | 1 + + drivers/base/core.c | 15 + + drivers/base/dd.c | 11 +- + drivers/base/driver.c | 69 ++++ + drivers/base/firmware_loader/Kconfig | 42 +- + drivers/base/firmware_loader/Makefile | 2 + + drivers/base/firmware_loader/fallback.c | 430 --------------------- + drivers/base/firmware_loader/fallback.h | 46 +-- + drivers/base/firmware_loader/firmware.h | 16 + + drivers/base/firmware_loader/main.c | 94 ++++- + drivers/base/firmware_loader/sysfs.c | 422 ++++++++++++++++++++ + drivers/base/firmware_loader/sysfs.h | 117 ++++++ + drivers/base/firmware_loader/sysfs_upload.c | 396 +++++++++++++++++++ + drivers/base/firmware_loader/sysfs_upload.h | 41 ++ + drivers/base/memory.c | 5 +- + drivers/base/node.c | 1 + + drivers/base/physical_location.c | 137 +++++++ + drivers/base/physical_location.h | 16 + + drivers/base/platform.c | 34 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 25 +- + drivers/clk/imx/clk-scu.c | 7 +- + drivers/firmware/edd.c | 3 +- + drivers/hv/vmbus_drv.c | 28 +- + drivers/pci/pci-sysfs.c | 28 +- + drivers/rpmsg/rpmsg_core.c | 3 +- + drivers/rpmsg/rpmsg_internal.h | 13 +- + drivers/rpmsg/rpmsg_ns.c | 14 +- + drivers/s390/cio/cio.h | 6 +- + drivers/s390/cio/css.c | 28 +- + drivers/slimbus/qcom-ngd-ctrl.c | 13 +- + drivers/spi/spi.c | 26 +- + drivers/vdpa/vdpa.c | 29 +- + fs/kernfs/file.c | 23 +- + include/linux/amba/bus.h | 6 +- + include/linux/device.h | 73 ++++ + include/linux/device/driver.h | 2 + + include/linux/firmware.h | 82 ++++ + include/linux/fsl/mc.h | 6 +- + include/linux/hyperv.h | 6 +- + include/linux/pci.h | 6 +- + include/linux/platform_device.h | 6 +- + include/linux/rpmsg.h | 6 +- + include/linux/spi/spi.h | 2 + + include/linux/vdpa.h | 4 +- + lib/test_firmware.c | 378 ++++++++++++++++++ + scripts/get_abi.pl | 4 +- + tools/testing/selftests/firmware/Makefile | 2 +- + tools/testing/selftests/firmware/config | 1 + + tools/testing/selftests/firmware/fw_filesystem.sh | 170 ++++---- + tools/testing/selftests/firmware/fw_lib.sh | 19 +- + tools/testing/selftests/firmware/fw_run_tests.sh | 4 + + tools/testing/selftests/firmware/fw_upload.sh | 214 ++++++++++ + 57 files changed, 2587 insertions(+), 819 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-firmware + create mode 100644 Documentation/ABI/testing/sysfs-devices-physical_location + create mode 100644 Documentation/driver-api/firmware/fw_upload.rst + create mode 100644 drivers/base/firmware_loader/sysfs.c + create mode 100644 drivers/base/firmware_loader/sysfs.h + create mode 100644 drivers/base/firmware_loader/sysfs_upload.c + create mode 100644 drivers/base/firmware_loader/sysfs_upload.h + create mode 100644 drivers/base/physical_location.c + create mode 100644 drivers/base/physical_location.h + create mode 100755 tools/testing/selftests/firmware/fw_upload.sh +Merging usb/usb-next (c40b62216c1a usb: core: hcd: Create platform devices for onboard hubs in probe()) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml +Auto-merging Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/mips/boot/dts/ingenic/x1000.dtsi +Auto-merging drivers/base/property.c +Auto-merging drivers/net/usb/cdc_ncm.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/usb/rndis_host.c +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/dwc3/drd.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c +Auto-merging drivers/usb/dwc3/dwc3-pci.c +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/gadget/configfs.c +Auto-merging drivers/usb/gadget/function/uvc_queue.c +Auto-merging drivers/usb/gadget/udc/omap_udc.c +Auto-merging drivers/usb/host/ohci-omap.c +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Auto-merging include/linux/property.h +Auto-merging sound/usb/midi.c +Resolved 'drivers/usb/dwc3/drd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6b1393801444] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 1 + + .../ABI/testing/sysfs-bus-platform-onboard-usb-hub | 8 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 7 + + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 72 +++ + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/generic-ohci.yaml | 1 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 4 + + .../bindings/usb/samsung,exynos-usb2.yaml | 15 +- + .../devicetree/bindings/usb/ti,am62-usb.yaml | 103 +++++ + Documentation/usb/gadget-testing.rst | 1 + + MAINTAINERS | 7 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 36 ++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +- + arch/mips/boot/dts/ingenic/x1000.dtsi | 2 +- + arch/mips/boot/dts/ingenic/x1830.dtsi | 2 +- + drivers/base/property.c | 96 +++- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/hid/usbhid/usbkbd.c | 2 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + drivers/input/misc/ati_remote2.c | 2 +- + drivers/input/misc/cm109.c | 2 +- + drivers/input/misc/powermate.c | 2 +- + drivers/input/misc/yealink.c | 2 +- + drivers/input/tablet/acecad.c | 2 +- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/media/rc/ati_remote.c | 4 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/rc/streamzap.c | 2 +- + drivers/media/rc/xbox_remote.c | 2 +- + drivers/media/usb/tm6000/tm6000-dvb.c | 2 +- + drivers/media/usb/tm6000/tm6000-input.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 2 +- + drivers/net/usb/cdc_ncm.c | 4 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/wireless/mediatek/mt76/usb.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/c67x00/c67x00-sched.c | 4 +- + drivers/usb/core/devices.c | 47 -- + drivers/usb/core/driver.c | 25 +- + drivers/usb/core/hcd-pci.c | 5 +- + drivers/usb/core/hcd.c | 6 + + drivers/usb/core/hub.c | 2 +- + drivers/usb/dwc2/core.c | 9 + + drivers/usb/dwc2/core.h | 5 + + drivers/usb/dwc2/params.c | 50 +- + drivers/usb/dwc3/Kconfig | 9 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 56 ++- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/drd.c | 50 -- + drivers/usb/dwc3/dwc3-am62.c | 332 ++++++++++++++ + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/ep0.c | 1 + + drivers/usb/dwc3/gadget.c | 31 +- + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/configfs.c | 2 +- + drivers/usb/gadget/function/f_acm.c | 10 + + drivers/usb/gadget/function/f_uvc.c | 4 +- + drivers/usb/gadget/function/u_audio.c | 4 +- + drivers/usb/gadget/function/u_uvc.h | 1 + + drivers/usb/gadget/function/uvc.h | 1 + + drivers/usb/gadget/function/uvc_configfs.c | 41 ++ + drivers/usb/gadget/function/uvc_queue.c | 30 +- + drivers/usb/gadget/function/uvc_queue.h | 3 +- + drivers/usb/gadget/function/uvc_video.c | 17 +- + drivers/usb/gadget/legacy/dbgp.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + drivers/usb/gadget/legacy/raw_gadget.c | 4 +- + drivers/usb/gadget/udc/core.c | 273 ++++++----- + drivers/usb/gadget/udc/net2272.c | 6 +- + drivers/usb/gadget/udc/net2280.c | 14 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.h | 2 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 4 +- + drivers/usb/gadget/udc/tegra-xudc.c | 4 +- + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/fhci-hcd.c | 3 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 11 +- + drivers/usb/host/isp1362-hcd.c | 6 +- + drivers/usb/host/max3421-hcd.c | 6 +- + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/host/ohci-ppc-of.c | 3 - + drivers/usb/host/oxu210hp-hcd.c | 16 +- + drivers/usb/host/r8a66597-hcd.c | 3 +- + drivers/usb/host/sl811-hcd.c | 6 +- + drivers/usb/isp1760/isp1760-hcd.c | 6 +- + drivers/usb/misc/Kconfig | 23 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/ftdi-elan.c | 15 +- + drivers/usb/misc/lvstest.c | 2 +- + drivers/usb/misc/onboard_usb_hub.c | 510 +++++++++++++++++++++ + drivers/usb/musb/mediatek.c | 73 +-- + drivers/usb/musb/omap2430.c | 1 + + drivers/usb/storage/alauda.c | 4 +- + drivers/usb/storage/isd200.c | 8 +- + drivers/usb/storage/karma.c | 15 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/shuttle_usbat.c | 28 +- + drivers/usb/storage/transport.c | 2 +- + drivers/usb/typec/bus.c | 2 +- + drivers/usb/typec/mux.c | 271 ++++++++--- + drivers/usb/typec/mux.h | 12 +- + drivers/usb/typec/mux/Kconfig | 10 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/fsa4480.c | 218 +++++++++ + drivers/usb/typec/mux/intel_pmc_mux.c | 29 +- + drivers/usb/typec/mux/pi3usb30532.c | 8 +- + drivers/usb/typec/tipd/core.c | 32 +- + drivers/usb/typec/ucsi/ucsi.c | 85 ++-- + drivers/usb/typec/ucsi/ucsi.h | 6 +- + drivers/usb/usbip/stub_dev.c | 2 +- + drivers/usb/usbip/stub_rx.c | 2 + + include/linux/of_platform.h | 22 +- + include/linux/property.h | 5 + + include/linux/usb.h | 17 +- + include/linux/usb/gadget.h | 26 +- + include/linux/usb/hcd.h | 1 + + include/linux/usb/onboard_hub.h | 18 + + include/linux/usb/typec_mux.h | 22 +- + sound/usb/line6/pcm.c | 4 +- + sound/usb/midi.c | 4 +- + sound/usb/usx2y/usb_stream.c | 6 +- + sound/usb/usx2y/usbusx2yaudio.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + tools/usb/testusb.c | 2 +- + 129 files changed, 2313 insertions(+), 728 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub + create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,am62-usb.yaml + create mode 100644 drivers/usb/dwc3/dwc3-am62.c + create mode 100644 drivers/usb/misc/onboard_usb_hub.c + create mode 100644 drivers/usb/typec/mux/fsa4480.c + create mode 100644 include/linux/usb/onboard_hub.h +$ git am -3 ../patches/0001-Revert-usb-core-hcd-Create-platform-devices-for-onbo.patch +Applying: Revert "usb: core: hcd: Create platform devices for onboard hubs in probe()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/core/hcd.c +M include/linux/usb/hcd.h +$ git add -A . +$ git commit -v -a --amend +[master 8763cd407fc6] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git + Date: Tue May 3 13:45:49 2022 +1000 +Merging thunderbolt/next (5dddb4169284 thunderbolt: Link USB4 ports to their USB Type-C connectors) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/nhi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 10 +++++++ + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/misc/mei/pxp/mei_pxp.c | 2 +- + drivers/thunderbolt/ctl.c | 15 +++++----- + drivers/thunderbolt/nhi.c | 2 +- + drivers/thunderbolt/path.c | 6 ++++ + drivers/thunderbolt/tb.c | 19 +++++++++++-- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/test.c | 16 +++++------ + drivers/thunderbolt/tunnel.c | 11 +++---- + drivers/thunderbolt/tunnel.h | 4 +-- + drivers/thunderbolt/usb4_port.c | 38 +++++++++++++++++++++++++ + 12 files changed, 98 insertions(+), 29 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (9e6a90790357 Merge 5.18-rc5 into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging Documentation/firmware-guide/acpi/enumeration.rst +Auto-merging Documentation/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/tty/goldfish.c +Auto-merging drivers/tty/serial/8250/8250.h +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/sysrq.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +- + .../bindings/serial/qcom,serial-geni-qcom.yaml | 86 ++++ + .../bindings/serial/renesas,em-uart.yaml | 9 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 7 + + .../devicetree/bindings/serial/rs485.yaml | 5 + + .../bindings/serial/socionext,uniphier-uart.yaml | 5 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/serial/driver.rst | 2 +- + Documentation/driver-api/serial/index.rst | 2 - + Documentation/driver-api/serial/n_gsm.rst | 159 ------ + Documentation/{ => driver-api}/tty/index.rst | 22 +- + .../driver-api/{serial => tty}/moxa-smartio.rst | 0 + Documentation/driver-api/tty/n_gsm.rst | 153 ++++++ + Documentation/{ => driver-api}/tty/n_tty.rst | 0 + Documentation/{ => driver-api}/tty/tty_buffer.rst | 0 + Documentation/{ => driver-api}/tty/tty_driver.rst | 0 + .../{ => driver-api}/tty/tty_internals.rst | 0 + Documentation/{ => driver-api}/tty/tty_ldisc.rst | 0 + Documentation/{ => driver-api}/tty/tty_port.rst | 0 + Documentation/{ => driver-api}/tty/tty_struct.rst | 0 + Documentation/firmware-guide/acpi/enumeration.rst | 25 + + Documentation/index.rst | 1 - + MAINTAINERS | 2 +- + drivers/char/Kconfig | 3 +- + drivers/char/ttyprintk.c | 16 + + drivers/tty/goldfish.c | 2 + + drivers/tty/hvc/hvc_opal.c | 6 +- + drivers/tty/hvc/hvc_vio.c | 2 +- + drivers/tty/hvc/hvcs.c | 5 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/n_gsm.c | 6 +- + drivers/tty/n_tty.c | 67 ++- + drivers/tty/serial/8250/8250.h | 19 + + drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 + + drivers/tty/serial/8250/8250_dma.c | 7 +- + drivers/tty/serial/8250/8250_dw.c | 139 ++++-- + drivers/tty/serial/8250/8250_dwlib.c | 116 ++++- + drivers/tty/serial/8250/8250_dwlib.h | 51 ++ + drivers/tty/serial/8250/8250_of.c | 2 + + drivers/tty/serial/8250/8250_pci.c | 67 +-- + drivers/tty/serial/8250/8250_port.c | 117 ++++- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/Kconfig | 9 +- + drivers/tty/serial/altera_jtaguart.c | 6 +- + drivers/tty/serial/amba-pl011.c | 16 +- + drivers/tty/serial/atmel_serial.c | 4 +- + drivers/tty/serial/cpm_uart/cpm_uart.h | 2 + + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 1 - + drivers/tty/serial/fsl_lpuart.c | 58 +-- + drivers/tty/serial/icom.c | 538 +++++++++++++++------ + drivers/tty/serial/icom.h | 274 ----------- + drivers/tty/serial/imx.c | 2 - + drivers/tty/serial/max310x.c | 1 - + drivers/tty/serial/meson_uart.c | 27 +- + drivers/tty/serial/mpc52xx_uart.c | 5 +- + drivers/tty/serial/omap-serial.c | 13 +- + drivers/tty/serial/owl-uart.c | 7 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/sa1100.c | 4 +- + drivers/tty/serial/samsung_tty.c | 12 + + drivers/tty/serial/sc16is7xx.c | 10 - + drivers/tty/serial/serial_core.c | 78 ++- + drivers/tty/serial/stm32-usart.c | 109 ++++- + drivers/tty/serial/stm32-usart.h | 2 + + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 46 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink_gt.c | 2 + + drivers/tty/sysrq.c | 27 +- + include/linux/serial_core.h | 1 + + 71 files changed, 1460 insertions(+), 915 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml + delete mode 100644 Documentation/driver-api/serial/n_gsm.rst + rename Documentation/{ => driver-api}/tty/index.rst (81%) + rename Documentation/driver-api/{serial => tty}/moxa-smartio.rst (100%) + create mode 100644 Documentation/driver-api/tty/n_gsm.rst + rename Documentation/{ => driver-api}/tty/n_tty.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_buffer.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_driver.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_internals.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_ldisc.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_port.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_struct.rst (100%) + delete mode 100644 drivers/tty/serial/icom.h +Merging char-misc/char-misc-next (35a7609639c4 Merge 5.18-rc5 into char-misc-next) +$ 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 +Merge made by the 'ort' strategy. + drivers/accessibility/speakup/fakekey.c | 4 +- + drivers/accessibility/speakup/serialio.c | 2 +- + drivers/accessibility/speakup/speakup_acntpc.c | 2 +- + drivers/accessibility/speakup/speakup_acntsa.c | 2 +- + drivers/accessibility/speakup/speakup_apollo.c | 2 +- + drivers/accessibility/speakup/speakup_audptr.c | 2 +- + drivers/accessibility/speakup/speakup_bns.c | 2 +- + drivers/accessibility/speakup/speakup_decext.c | 2 +- + drivers/accessibility/speakup/speakup_dectlk.c | 2 +- + drivers/accessibility/speakup/speakup_dtlk.c | 2 +- + drivers/accessibility/speakup/speakup_dummy.c | 2 +- + drivers/accessibility/speakup/speakup_keypc.c | 2 +- + drivers/accessibility/speakup/speakup_ltlk.c | 2 +- + drivers/accessibility/speakup/speakup_soft.c | 2 +- + drivers/accessibility/speakup/speakup_spkout.c | 2 +- + drivers/accessibility/speakup/speakup_txprt.c | 2 +- + drivers/android/binder.c | 34 +- + drivers/android/binder_alloc.c | 22 +- + drivers/android/binder_internal.h | 2 + + drivers/bus/mhi/Kconfig | 1 + + drivers/bus/mhi/Makefile | 3 + + drivers/bus/mhi/common.h | 22 + + drivers/bus/mhi/ep/Kconfig | 10 + + drivers/bus/mhi/ep/Makefile | 2 + + drivers/bus/mhi/ep/internal.h | 218 ++++ + drivers/bus/mhi/ep/main.c | 1591 ++++++++++++++++++++++++ + drivers/bus/mhi/ep/mmio.c | 273 ++++ + drivers/bus/mhi/ep/ring.c | 207 +++ + drivers/bus/mhi/ep/sm.c | 148 +++ + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 24 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/char/xillybus/xillybus_class.c | 26 +- + drivers/char/xillybus/xillyusb.c | 1 + + drivers/firmware/stratix10-svc.c | 12 +- + drivers/firmware/xilinx/zynqmp.c | 131 +- + drivers/misc/bcm-vk/bcm_vk_msg.c | 29 +- + drivers/misc/fastrpc.c | 9 +- + drivers/misc/lkdtm/bugs.c | 96 +- + drivers/misc/lkdtm/cfi.c | 145 ++- + drivers/misc/lkdtm/core.c | 138 +- + drivers/misc/lkdtm/fortify.c | 17 +- + drivers/misc/lkdtm/heap.c | 47 +- + drivers/misc/lkdtm/lkdtm.h | 142 +-- + drivers/misc/lkdtm/perms.c | 47 +- + drivers/misc/lkdtm/powerpc.c | 11 +- + drivers/misc/lkdtm/refcount.c | 65 +- + drivers/misc/lkdtm/stackleak.c | 11 +- + drivers/misc/lkdtm/usercopy.c | 49 +- + drivers/misc/pvpanic/pvpanic.c | 10 +- + drivers/misc/vmw_balloon.c | 4 +- + drivers/misc/vmw_vmci/Kconfig | 2 +- + drivers/misc/vmw_vmci/vmci_context.c | 15 +- + drivers/misc/vmw_vmci/vmci_guest.c | 4 + + drivers/misc/vmw_vmci/vmci_queue_pair.c | 12 + + drivers/nvmem/bcm-ocotp.c | 2 +- + drivers/nvmem/sunplus-ocotp.c | 4 +- + drivers/virt/fsl_hypervisor.c | 3 +- + drivers/w1/masters/ds2490.c | 124 +- + include/linux/firmware/xlnx-zynqmp.h | 11 + + include/linux/mhi_ep.h | 277 +++++ + include/linux/mod_devicetable.h | 2 + + scripts/mod/file2alias.c | 10 + + tools/testing/selftests/lkdtm/config | 2 + + tools/testing/selftests/lkdtm/tests.txt | 1 + + 65 files changed, 3544 insertions(+), 510 deletions(-) + create mode 100644 drivers/bus/mhi/ep/Kconfig + create mode 100644 drivers/bus/mhi/ep/Makefile + create mode 100644 drivers/bus/mhi/ep/internal.h + create mode 100644 drivers/bus/mhi/ep/main.c + create mode 100644 drivers/bus/mhi/ep/mmio.c + create mode 100644 drivers/bus/mhi/ep/ring.c + create mode 100644 drivers/bus/mhi/ep/sm.c + create mode 100644 include/linux/mhi_ep.h +Merging coresight/next (c86dd9869128 coresight: etm4x: Cleanup TRCRSCTLRn register accesses) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/hwtracing/coresight/coresight-etm3x-core.c | 2 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 136 +++++----------- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 180 +++++++++++---------- + drivers/hwtracing/coresight/coresight-etm4x.h | 120 +++++++++++--- + 5 files changed, 242 insertions(+), 198 deletions(-) +Merging fpga/for-next (eee1071ee7df fpga: Use tab instead of space indentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/fpga/Makefile | 6 +++--- + drivers/fpga/fpga-mgr.c | 8 ++++++-- + drivers/fpga/fpga-region.c | 7 ++++--- + drivers/fpga/of-fpga-region.c | 6 +++--- + drivers/fpga/zynq-fpga.c | 2 +- + include/linux/fpga/fpga-region.h | 7 ++++--- + 7 files changed, 22 insertions(+), 16 deletions(-) +Merging icc/icc-next (2c16d1b0fc5f Merge branch 'icc-const' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,rpmh.yaml | 15 + + drivers/interconnect/core.c | 8 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/icc-rpm.c | 2 +- + drivers/interconnect/qcom/icc-rpm.h | 2 +- + drivers/interconnect/qcom/icc-rpmh.c | 2 +- + drivers/interconnect/qcom/icc-rpmh.h | 6 +- + drivers/interconnect/qcom/msm8916.c | 12 +- + drivers/interconnect/qcom/msm8939.c | 16 +- + drivers/interconnect/qcom/msm8974.c | 28 +- + drivers/interconnect/qcom/msm8996.c | 16 +- + drivers/interconnect/qcom/osm-l3.c | 16 +- + drivers/interconnect/qcom/qcm2290.c | 24 +- + drivers/interconnect/qcom/qcs404.c | 12 +- + drivers/interconnect/qcom/sc7180.c | 68 +- + drivers/interconnect/qcom/sc7280.c | 72 +- + drivers/interconnect/qcom/sc8180x.c | 44 +- + drivers/interconnect/qcom/sc8280xp.c | 2438 ++++++++++++++++++++ + drivers/interconnect/qcom/sc8280xp.h | 209 ++ + drivers/interconnect/qcom/sdm660.c | 24 +- + drivers/interconnect/qcom/sdm845.c | 32 +- + drivers/interconnect/qcom/sdx55.c | 12 +- + drivers/interconnect/qcom/sdx65.c | 231 ++ + drivers/interconnect/qcom/sdx65.h | 65 + + drivers/interconnect/qcom/sm8150.c | 66 +- + drivers/interconnect/qcom/sm8250.c | 66 +- + drivers/interconnect/qcom/sm8350.c | 60 +- + drivers/interconnect/qcom/sm8450.c | 68 +- + include/dt-bindings/interconnect/qcom,sc8280xp.h | 232 ++ + include/dt-bindings/interconnect/qcom,sdx65.h | 67 + + 31 files changed, 3610 insertions(+), 325 deletions(-) + create mode 100644 drivers/interconnect/qcom/sc8280xp.c + create mode 100644 drivers/interconnect/qcom/sc8280xp.h + create mode 100644 drivers/interconnect/qcom/sdx65.c + create mode 100644 drivers/interconnect/qcom/sdx65.h + create mode 100644 include/dt-bindings/interconnect/qcom,sc8280xp.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdx65.h +Merging iio/togreg (eda75f8238b0 iio: ti-ads8688: use of_device_id for OF matching) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/adc/ad7280a.c +Auto-merging drivers/iio/dac/ad5446.c +Auto-merging drivers/iio/dac/ltc2688.c +Auto-merging drivers/iio/dac/ti-dac5571.c +Auto-merging drivers/iio/imu/bmi160/bmi160_core.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 3 +- + .../bindings/iio/adc/sprd,sc2720-adc.yaml | 60 ++- + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 2 +- + .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 2 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 34 +- + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 38 +- + .../devicetree/bindings/iio/light/stk33xx.yaml | 6 + + .../iio/potentiometer/microchip,mcp4131.yaml | 2 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + MAINTAINERS | 12 +- + drivers/iio/accel/Kconfig | 1 - + drivers/iio/accel/adxl355_core.c | 7 +- + drivers/iio/accel/adxl367.c | 1 - + drivers/iio/accel/bmc150-accel-core.c | 4 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 1 - + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/mma8452.c | 1 + + drivers/iio/accel/sca3000.c | 1 - + drivers/iio/accel/ssp_accel_sensor.c | 1 - + drivers/iio/accel/st_accel.h | 28 +- + drivers/iio/accel/st_accel_core.c | 14 +- + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/ad7124.c | 86 +++- + drivers/iio/adc/ad7192.c | 68 ++- + drivers/iio/adc/ad7266.c | 44 +- + drivers/iio/adc/ad7280a.c | 2 +- + drivers/iio/adc/ad_sigma_delta.c | 143 ++++++- + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/ina2xx-adc.c | 3 +- + drivers/iio/adc/palmas_gpadc.c | 3 +- + drivers/iio/adc/sc27xx_adc.c | 470 +++++++++++++++++++-- + drivers/iio/adc/stm32-dfsdm-adc.c | 5 +- + drivers/iio/adc/stmpe-adc.c | 21 +- + drivers/iio/adc/ti-ads1015.c | 398 +++++++++-------- + drivers/iio/adc/ti-ads8688.c | 1 + + drivers/iio/adc/ti_am335x_adc.c | 4 +- + drivers/iio/afe/Kconfig | 1 - + drivers/iio/afe/iio-rescale.c | 5 +- + drivers/iio/buffer/kfifo_buf.c | 10 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 1 - + drivers/iio/common/ssp_sensors/ssp_spi.c | 13 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 50 ++- + drivers/iio/dac/Kconfig | 4 +- + drivers/iio/dac/ad5064.c | 2 +- + drivers/iio/dac/ad5360.c | 2 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 2 +- + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/dac/ad5755.c | 2 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/ad7303.c | 2 +- + drivers/iio/dac/ltc2632.c | 8 +- + drivers/iio/dac/ltc2688.c | 19 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 4 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/dummy/iio_simple_dummy.c | 20 +- + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 8 +- + drivers/iio/gyro/mpu3050-core.c | 14 +- + drivers/iio/gyro/mpu3050-i2c.c | 4 +- + drivers/iio/gyro/mpu3050.h | 2 +- + drivers/iio/gyro/ssp_gyro_sensor.c | 1 - + drivers/iio/gyro/st_gyro_core.c | 15 +- + drivers/iio/health/max30100.c | 1 - + drivers/iio/health/max30102.c | 1 - + drivers/iio/imu/adis16480.c | 91 ++-- + drivers/iio/imu/bmi160/bmi160_core.c | 27 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 13 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 18 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 1 - + drivers/iio/imu/inv_mpu6050/Kconfig | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/imu/st_lsm6dsx/Kconfig | 6 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 42 +- + drivers/iio/industrialio-core.c | 46 +- + drivers/iio/industrialio-event.c | 2 +- + drivers/iio/industrialio-trigger.c | 2 +- + drivers/iio/light/Kconfig | 1 - + drivers/iio/light/apds9960.c | 1 - + drivers/iio/light/stk3310.c | 25 ++ + drivers/iio/light/tsl2772.c | 25 +- + drivers/iio/magnetometer/Kconfig | 1 - + drivers/iio/magnetometer/rm3100-core.c | 15 +- + drivers/iio/magnetometer/st_magn_core.c | 15 +- + drivers/iio/multiplexer/Kconfig | 1 - + drivers/iio/multiplexer/iio-mux.c | 49 +-- + drivers/iio/pressure/st_pressure_core.c | 8 +- + drivers/iio/proximity/mb1232.c | 8 +- + drivers/iio/proximity/ping.c | 5 +- + drivers/iio/proximity/vl53l0x-i2c.c | 7 +- + drivers/iio/temperature/ltc2983.c | 236 ++++++----- + drivers/iio/temperature/max31856.c | 6 +- + drivers/iio/temperature/max31865.c | 4 +- + drivers/iio/trigger/iio-trig-sysfs.c | 11 +- + drivers/staging/iio/cdc/ad7746.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 1 - + drivers/staging/iio/resolver/ad2s1210.c | 1 - + include/linux/iio/adc/ad_sigma_delta.h | 38 ++ + include/linux/iio/common/st_sensors.h | 3 + + include/linux/iio/iio-opaque.h | 4 + + include/linux/iio/iio.h | 70 ++- + include/linux/iio/kfifo_buf.h | 5 +- + 122 files changed, 1718 insertions(+), 835 deletions(-) +Merging phy-next/next (bc055a50a859 dt-bindings: phy: renesas,usb2-phy: Document RZ/G2UL phy bindings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 + + .../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 2 +- + .../devicetree/bindings/phy/mixel,mipi-dsi-phy.txt | 29 --- + .../bindings/phy/mixel,mipi-dsi-phy.yaml | 107 ++++++++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 4 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 1 + + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 91 +++++-- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 47 +++- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 89 +++++-- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 98 ++++++-- + drivers/phy/Kconfig | 1 + + drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 166 ++++++++++++- + drivers/phy/cadence/phy-cadence-sierra.c | 193 +++++++++++++- + drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c | 276 ++++++++++++++++++++- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 10 +- + drivers/phy/mediatek/phy-mtk-hdmi.c | 50 ++-- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 29 +-- + drivers/phy/phy-can-transceiver.c | 24 +- + drivers/phy/phy-core.c | 44 +++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 81 +++++- + drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 7 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 129 ++++++++-- + drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- + include/linux/phy/phy-lvds.h | 32 +++ + include/linux/phy/phy.h | 4 + + 26 files changed, 1327 insertions(+), 208 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.yaml + create mode 100644 include/linux/phy/phy-lvds.h +Merging soundwire/next (60657fb9b19d dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 14 ++++++++++++++ + drivers/soundwire/qcom.c | 3 ++- + drivers/soundwire/stream.c | 1 + + 3 files changed, 17 insertions(+), 1 deletion(-) +Merging extcon/extcon-next (ef799ab8dc5c extcon: Modify extcon device to be created after driver data is set) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/usb/dwc3/drd.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c +Resolved 'drivers/usb/dwc3/drd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 538f9c67a440] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +- + drivers/extcon/Kconfig | 3 +- + drivers/extcon/extcon-axp288.c | 4 +- + drivers/extcon/extcon-intel-int3496.c | 54 ++++++++++++++++++---- + drivers/extcon/extcon-ptn5150.c | 36 +++++++++++++++ + drivers/extcon/extcon-sm5502.c | 2 + + drivers/extcon/extcon-usb-gpio.c | 15 ------ + drivers/extcon/extcon-usbc-cros-ec.c | 2 +- + drivers/extcon/extcon.c | 37 +++++++++------ + drivers/power/supply/axp288_charger.c | 17 ++++--- + drivers/power/supply/charger-manager.c | 7 +-- + drivers/power/supply/max8997_charger.c | 8 ++-- + drivers/usb/phy/phy-omap-otg.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + include/linux/extcon.h | 2 +- + 15 files changed, 137 insertions(+), 63 deletions(-) +$ git am -3 ../patches/0001-fixup-for-usb-dwc3-Don-t-switch-OTG-peripheral-if-ex.patch +Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/dwc3/core.c +$ git add -A . +$ git commit -v -a --amend +[master 4840c6e1cb77] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git + Date: Tue May 3 14:07:35 2022 +1000 +Merging gnss/gnss-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (676d7cda1a3c Merge remote-tracking branch 'iommu/vfio-notifier-fix', tag 'gvt-next-2022-04-29' into v5.19/vfio/next-jgg) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'ort' strategy. +Merging staging/staging-next (5fe7856ad59a staging: vt6655: Replace MACvReadISR with VNSvInPortD) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/silabs/wfx/sta.c +Auto-merging drivers/staging/greybus/audio_codec.c +Merge made by the 'ort' strategy. + MAINTAINERS | 10 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/net/wireless/silabs/wfx/hif_tx.c | 10 +- + drivers/net/wireless/silabs/wfx/main.c | 2 +- + drivers/net/wireless/silabs/wfx/sta.c | 20 +- + drivers/staging/Kconfig | 3 +- + drivers/staging/Makefile | 3 +- + drivers/staging/fieldbus/anybuss/host.c | 2 +- + drivers/staging/greybus/arche-apb-ctrl.c | 2 +- + drivers/staging/greybus/audio_codec.c | 32 +- + drivers/staging/greybus/pwm.c | 1 - + drivers/staging/greybus/tools/loopback_test.c | 2 +- + drivers/staging/ks7010/ks_hostif.c | 21 +- + drivers/staging/ks7010/ks_wlan.h | 2 +- + drivers/staging/most/dim2/dim2.c | 29 +- + drivers/staging/qlge/qlge.h | 1 + + drivers/staging/r8188eu/core/rtw_ap.c | 3 - + drivers/staging/r8188eu/core/rtw_br_ext.c | 73 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 337 ++- + drivers/staging/r8188eu/core/rtw_fw.c | 163 +- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 45 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 4 +- + drivers/staging/r8188eu/core/rtw_iol.c | 4 +- + drivers/staging/r8188eu/core/rtw_led.c | 10 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 319 ++- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 602 +++--- + drivers/staging/r8188eu/core/rtw_p2p.c | 58 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 101 +- + drivers/staging/r8188eu/core/rtw_recv.c | 312 ++- + drivers/staging/r8188eu/core/rtw_security.c | 6 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 109 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 17 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 6 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- + drivers/staging/r8188eu/hal/hal_com.c | 4 +- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 49 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 15 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 3 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 8 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 351 +--- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +- + drivers/staging/r8188eu/include/HalVerDef.h | 5 +- + drivers/staging/r8188eu/include/basic_types.h | 73 +- + drivers/staging/r8188eu/include/drv_types.h | 6 +- + drivers/staging/r8188eu/include/hal_intf.h | 33 +- + drivers/staging/r8188eu/include/ieee80211.h | 53 - + drivers/staging/r8188eu/include/odm.h | 29 - + drivers/staging/r8188eu/include/osdep_service.h | 47 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +- + drivers/staging/r8188eu/include/rtw_eeprom.h | 3 - + drivers/staging/r8188eu/include/rtw_fw.h | 5 + + drivers/staging/r8188eu/include/rtw_ioctl.h | 79 - + drivers/staging/r8188eu/include/rtw_mlme.h | 9 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 44 +- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 23 +- + drivers/staging/r8188eu/include/rtw_recv.h | 2 - + drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- + drivers/staging/r8188eu/include/usb_ops.h | 22 +- + drivers/staging/r8188eu/include/usb_osintf.h | 4 - + drivers/staging/r8188eu/include/usb_vendor_req.h | 35 - + drivers/staging/r8188eu/include/wifi.h | 60 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 66 +- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 1 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 45 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 27 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 5 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 19 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 52 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 3 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 +- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 10 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 38 +- + drivers/staging/rtl8192e/rtllib_rx.c | 22 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 65 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 32 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 8 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +- + drivers/staging/rtl8712/drv_types.h | 3 +- + drivers/staging/rtl8712/ieee80211.c | 4 +- + drivers/staging/rtl8712/os_intfs.c | 1 - + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_efuse.h | 4 +- + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 3 - + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 1 - + drivers/staging/rtl8712/rtl8712_recv.c | 16 +- + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_spec.h | 3 - + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 4 - + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 1 - + drivers/staging/rtl8712/rtl871x_cmd.c | 4 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 3 - + drivers/staging/rtl8712/rtl871x_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 24 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 102 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 3 - + drivers/staging/rtl8712/rtl871x_recv.c | 1 - + drivers/staging/rtl8712/rtl871x_security.c | 1 - + drivers/staging/rtl8712/sta_info.h | 1 - + drivers/staging/rtl8712/usb_intf.c | 8 +- + drivers/staging/rtl8712/wifi.h | 1 - + drivers/staging/rtl8712/xmit_linux.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 44 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 66 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 194 +- + drivers/staging/rtl8723bs/core/rtw_rf.c | 56 +- + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 11 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 - + drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 10 - + drivers/staging/rtl8723bs/include/drv_types.h | 1 - + drivers/staging/rtl8723bs/include/hal_com_reg.h | 295 --- + drivers/staging/rtl8723bs/include/rtw_ioctl.h | 72 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_transport.c | 12 +- + drivers/staging/sm750fb/sm750_hw.c | 1 + + .../Documentation/ABI/sysfs-platform-visorchipset | 89 - + drivers/staging/unisys/Documentation/overview.txt | 337 --- + drivers/staging/unisys/Kconfig | 16 - + drivers/staging/unisys/MAINTAINERS | 5 - + drivers/staging/unisys/Makefile | 7 - + drivers/staging/unisys/TODO | 16 - + drivers/staging/unisys/include/iochannel.h | 571 ------ + drivers/staging/unisys/visorhba/Kconfig | 15 - + drivers/staging/unisys/visorhba/Makefile | 10 - + drivers/staging/unisys/visorhba/visorhba_main.c | 1142 ----------- + drivers/staging/unisys/visorinput/Kconfig | 16 - + drivers/staging/unisys/visorinput/Makefile | 7 - + drivers/staging/unisys/visorinput/visorinput.c | 788 ------- + drivers/staging/unisys/visornic/Kconfig | 16 - + drivers/staging/unisys/visornic/Makefile | 10 - + drivers/staging/unisys/visornic/visornic_main.c | 2148 -------------------- + drivers/staging/vc04_services/Kconfig | 1 + + .../staging/vc04_services/bcm2835-audio/Kconfig | 8 +- + drivers/staging/vc04_services/bcm2835-audio/TODO | 10 - + .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 86 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 33 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 2 +- + .../staging/vc04_services/bcm2835-camera/Kconfig | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 26 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 13 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 1 - + drivers/staging/vme/Makefile | 2 - + drivers/staging/{vme/devices => vme_user}/Kconfig | 2 +- + drivers/staging/{vme/devices => vme_user}/Makefile | 0 + .../staging/{vme/devices => vme_user}/vme_user.c | 2 +- + .../staging/{vme/devices => vme_user}/vme_user.h | 0 + drivers/staging/vt6655/baseband.c | 7 +- + drivers/staging/vt6655/card.c | 3 +- + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/key.c | 1 - + drivers/staging/vt6655/mac.c | 1 - + drivers/staging/vt6655/mac.h | 210 +- + drivers/staging/vt6655/srom.c | 9 +- + drivers/staging/vt6655/tmacro.h | 43 - + drivers/staging/vt6655/upc.h | 19 - + drivers/staging/vt6656/channel.c | 1 - + drivers/staging/vt6656/rf.c | 1 - + drivers/staging/wlan-ng/cfg80211.c | 10 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/prism2usb.c | 8 +- + drivers/visorbus/Kconfig | 15 - + drivers/visorbus/Makefile | 10 - + drivers/visorbus/controlvmchannel.h | 650 ------ + drivers/visorbus/vbuschannel.h | 95 - + drivers/visorbus/visorbus_main.c | 1234 ----------- + drivers/visorbus/visorbus_private.h | 48 - + drivers/visorbus/visorchannel.c | 434 ---- + drivers/visorbus/visorchipset.c | 1691 --------------- + drivers/vme/Kconfig | 2 - + 198 files changed, 1798 insertions(+), 13016 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl.h + delete mode 100644 drivers/staging/unisys/Documentation/ABI/sysfs-platform-visorchipset + delete mode 100644 drivers/staging/unisys/Documentation/overview.txt + delete mode 100644 drivers/staging/unisys/Kconfig + delete mode 100644 drivers/staging/unisys/MAINTAINERS + delete mode 100644 drivers/staging/unisys/Makefile + delete mode 100644 drivers/staging/unisys/TODO + delete mode 100644 drivers/staging/unisys/include/iochannel.h + delete mode 100644 drivers/staging/unisys/visorhba/Kconfig + delete mode 100644 drivers/staging/unisys/visorhba/Makefile + delete mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c + delete mode 100644 drivers/staging/unisys/visorinput/Kconfig + delete mode 100644 drivers/staging/unisys/visorinput/Makefile + delete mode 100644 drivers/staging/unisys/visorinput/visorinput.c + delete mode 100644 drivers/staging/unisys/visornic/Kconfig + delete mode 100644 drivers/staging/unisys/visornic/Makefile + delete mode 100644 drivers/staging/unisys/visornic/visornic_main.c + delete mode 100644 drivers/staging/vc04_services/bcm2835-audio/TODO + delete mode 100644 drivers/staging/vme/Makefile + rename drivers/staging/{vme/devices => vme_user}/Kconfig (93%) + rename drivers/staging/{vme/devices => vme_user}/Makefile (100%) + rename drivers/staging/{vme/devices => vme_user}/vme_user.c (99%) + rename drivers/staging/{vme/devices => vme_user}/vme_user.h (100%) + delete mode 100644 drivers/staging/vt6655/tmacro.h + delete mode 100644 drivers/visorbus/Kconfig + delete mode 100644 drivers/visorbus/Makefile + delete mode 100644 drivers/visorbus/controlvmchannel.h + delete mode 100644 drivers/visorbus/vbuschannel.h + delete mode 100644 drivers/visorbus/visorbus_main.c + delete mode 100644 drivers/visorbus/visorbus_private.h + delete mode 100644 drivers/visorbus/visorchannel.c + delete mode 100644 drivers/visorbus/visorchipset.c +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (99faef48e7a3 dmaengine: mv_xor_v2 : Move spin_lock_bh() to spin_lock()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging Documentation/devicetree/bindings/dma/qcom,gpi.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/dma/at_xdmac.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/idxd/sysfs.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 110 ++ + .../devicetree/bindings/dma/qcom,gpi.yaml | 3 + + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +- + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 6 +- + Documentation/driver-api/dmaengine/provider.rst | 8 +- + MAINTAINERS | 2 +- + drivers/dma/Kconfig | 11 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 11 - + drivers/dma/at_hdmac.c | 10 +- + drivers/dma/at_xdmac.c | 9 +- + drivers/dma/bestcomm/bestcomm.c | 2 + + drivers/dma/dma-jz4780.c | 9 + + drivers/dma/dmaengine.c | 7 - + drivers/dma/dmatest.c | 13 +- + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/idxd/cdev.c | 6 +- + drivers/dma/idxd/device.c | 127 +- + drivers/dma/idxd/dma.c | 39 +- + drivers/dma/idxd/idxd.h | 2 - + drivers/dma/idxd/registers.h | 1 + + drivers/dma/idxd/sysfs.c | 10 +- + drivers/dma/mediatek/mtk-cqdma.c | 12 +- + drivers/dma/mediatek/mtk-hsdma.c | 13 +- + drivers/dma/mv_xor_v2.c | 4 +- + drivers/dma/nbpfaxi.c | 14 +- + drivers/dma/plx_dma.c | 4 +- + drivers/dma/ptdma/ptdma-dev.c | 36 +- + drivers/dma/ptdma/ptdma-dmaengine.c | 16 +- + drivers/dma/ptdma/ptdma.h | 13 + + drivers/dma/qcom/gpi.c | 20 +- + drivers/dma/qcom/hidma.c | 13 +- + drivers/dma/sf-pdma/sf-pdma.c | 24 +- + drivers/dma/sf-pdma/sf-pdma.h | 8 +- + drivers/dma/sh/Kconfig | 2 +- + drivers/dma/stm32-mdma.c | 21 +- + drivers/dma/tegra186-gpc-dma.c | 1506 ++++++++++++++++++++ + drivers/dma/ti/k3-psil-am62.c | 8 +- + include/linux/dmaengine.h | 9 +- + include/uapi/linux/idxd.h | 31 +- + 41 files changed, 1981 insertions(+), 183 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml + create mode 100644 drivers/dma/tegra186-gpc-dma.c +Merging cgroup/for-next (5c26993c31f0 cgroup: Add config file to cgroup selftest suite) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 12 + + tools/testing/selftests/cgroup/cgroup_util.h | 4 + + tools/testing/selftests/cgroup/config | 8 + + tools/testing/selftests/cgroup/test_cpu.c | 726 +++++++++++++++++++++++++++ + 6 files changed, 753 insertions(+) + create mode 100644 tools/testing/selftests/cgroup/config + create mode 100644 tools/testing/selftests/cgroup/test_cpu.c +Merging scsi/for-next (a576d58bd4ac Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Merge made by the 'ort' strategy. + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 6 +- + drivers/scsi/lpfc/lpfc_attr.c | 55 ++- + drivers/scsi/lpfc/lpfc_bsg.c | 79 ++-- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 252 +++++++----- + drivers/scsi/lpfc/lpfc_els.c | 644 ++++++++++++++---------------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 143 +++---- + drivers/scsi/lpfc/lpfc_hw.h | 75 ++-- + drivers/scsi/lpfc/lpfc_hw4.h | 17 +- + drivers/scsi/lpfc/lpfc_init.c | 209 +++++----- + drivers/scsi/lpfc/lpfc_logmsg.h | 8 +- + drivers/scsi/lpfc/lpfc_mbox.c | 203 ++++++---- + drivers/scsi/lpfc/lpfc_nportdisc.c | 64 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 35 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 73 ++-- + drivers/scsi/lpfc/lpfc_scsi.c | 55 ++- + drivers/scsi/lpfc/lpfc_sli.c | 226 +++++------ + drivers/scsi/lpfc/lpfc_sli.h | 34 +- + drivers/scsi/lpfc/lpfc_sli4.h | 3 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 31 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 - + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/scsi.c | 4 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 10 +- + drivers/scsi/ufs/ufshpb.c | 7 - + drivers/scsi/vmw_pvscsi.c | 1 - + drivers/target/target_core_configfs.c | 47 ++- + 29 files changed, 1149 insertions(+), 1144 deletions(-) +Merging scsi-mkp/for-next (f304d35e5995 scsi: mpi3mr: Update driver version to 8.0.0.69.0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/sd.c +Merge made by the 'ort' strategy. + drivers/message/fusion/mptctl.c | 3 - + drivers/scsi/aacraid/aacraid.h | 2 +- + drivers/scsi/aha1542.c | 20 +- + drivers/scsi/bfa/bfad_debugfs.c | 3 +- + drivers/scsi/bfa/bfad_im.c | 1 - + drivers/scsi/dc395x.c | 15 +- + drivers/scsi/elx/efct/efct_io.c | 1 - + drivers/scsi/fnic/fnic_debugfs.c | 3 +- + drivers/scsi/fnic/fnic_main.c | 4 +- + drivers/scsi/hosts.c | 8 +- + drivers/scsi/ipr.c | 3 +- + drivers/scsi/lpfc/lpfc_bsg.c | 6 - + drivers/scsi/lpfc/lpfc_sli.c | 13 +- + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/megaraid.c | 2 +- + drivers/scsi/mpi3mr/Kconfig | 1 + + drivers/scsi/mpi3mr/Makefile | 1 + + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 53 -- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 27 - + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 31 +- + drivers/scsi/mpi3mr/mpi3mr.h | 133 ++- + drivers/scsi/mpi3mr/mpi3mr_app.c | 1605 +++++++++++++++++++++++++++++++++ + drivers/scsi/mpi3mr/mpi3mr_debug.h | 37 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 331 ++++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 52 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 32 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 11 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +- + drivers/scsi/qedf/qedf_attr.c | 2 - + drivers/scsi/qedf/qedf_main.c | 6 +- + drivers/scsi/qla2xxx/qla_edif.c | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 2 - + drivers/scsi/qla2xxx/qla_target.h | 1 - + drivers/scsi/qla4xxx/ql4_os.c | 1 - + drivers/scsi/scsi.c | 112 ++- + drivers/scsi/scsi_debug.c | 149 ++- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_scan.c | 12 +- + drivers/scsi/scsi_sysfs.c | 28 + + drivers/scsi/sd.c | 193 ++-- + drivers/scsi/sd.h | 33 +- + drivers/scsi/sd_dif.c | 8 +- + drivers/scsi/sd_zbc.c | 236 +++-- + drivers/scsi/sr.c | 14 +- + drivers/scsi/ufs/Kconfig | 26 +- + drivers/scsi/ufs/cdns-pltfrm.c | 2 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 + + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 1 + + drivers/scsi/ufs/tc-dwc-g210.c | 2 + + drivers/scsi/ufs/tc-dwc-g210.h | 2 + + drivers/scsi/ufs/ti-j721e-ufs.c | 6 +- + drivers/scsi/ufs/ufs-debugfs.c | 1 + + drivers/scsi/ufs/ufs-exynos.c | 5 +- + drivers/scsi/ufs/ufs-exynos.h | 8 +- + drivers/scsi/ufs/ufs-hisi.c | 2 + + drivers/scsi/ufs/ufs-hwmon.c | 1 + + drivers/scsi/ufs/ufs-mediatek.c | 31 +- + drivers/scsi/ufs/ufs-qcom-ice.c | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 28 +- + drivers/scsi/ufs/ufs-qcom.h | 6 +- + drivers/scsi/ufs/ufs-sysfs.c | 1 + + drivers/scsi/ufs/ufs-sysfs.h | 3 +- + drivers/scsi/ufs/ufs.h | 35 - + drivers/scsi/ufs/ufs_bsg.c | 6 + + drivers/scsi/ufs/ufs_bsg.h | 7 +- + drivers/scsi/ufs/ufs_quirks.h | 15 +- + drivers/scsi/ufs/ufshcd-crypto.h | 5 +- + drivers/scsi/ufs/ufshcd-dwc.c | 2 + + drivers/scsi/ufs/ufshcd-dwc.h | 2 + + drivers/scsi/ufs/ufshcd-pci.c | 4 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 28 +- + drivers/scsi/ufs/ufshcd-priv.h | 298 ++++++ + drivers/scsi/ufs/ufshcd.c | 240 +++-- + drivers/scsi/ufs/ufshcd.h | 368 ++------ + drivers/scsi/ufs/ufshci.h | 2 + + drivers/scsi/ufs/ufshpb.c | 14 +- + drivers/scsi/ufs/unipro.h | 18 +- + drivers/target/target_core_spc.c | 2 +- + drivers/target/target_core_user.c | 40 +- + include/scsi/libiscsi.h | 6 +- + include/scsi/scsi_device.h | 9 +- + include/scsi/scsi_proto.h | 9 +- + include/uapi/scsi/scsi_bsg_mpi3mr.h | 582 ++++++++++++ + 85 files changed, 4015 insertions(+), 1034 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi3mr_app.c + create mode 100644 drivers/scsi/ufs/ufshcd-priv.h + create mode 100644 include/uapi/scsi/scsi_bsg_mpi3mr.h +Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (e8d9d4560c51 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 10 ++ + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 26 +++++ + drivers/hwspinlock/omap_hwspinlock.c | 6 +- + drivers/remoteproc/imx_dsp_rproc.c | 105 ++------------------- + drivers/remoteproc/imx_rproc.c | 3 + + drivers/remoteproc/mtk_common.h | 2 + + drivers/remoteproc/mtk_scp.c | 76 +++++++++++---- + drivers/remoteproc/qcom_q6v5_pas.c | 33 +++++++ + drivers/remoteproc/remoteproc_cdev.c | 11 --- + drivers/remoteproc/remoteproc_core.c | 15 ++- + drivers/remoteproc/remoteproc_debugfs.c | 17 +--- + drivers/remoteproc/remoteproc_elf_loader.c | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 11 --- + drivers/rpmsg/qcom_smd.c | 4 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 9 +- + 15 files changed, 163 insertions(+), 167 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (30a35c07d9e9 gpio: vf610: drop the SOC_VF610 dependency for GPIO_VF610) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c +Auto-merging include/linux/gpio/driver.h +Merge made by the 'ort' strategy. + .../bindings/gpio/gpio-consumer-common.yaml | 64 +++++++++ + .../bindings/gpio/realtek,otto-gpio.yaml | 34 ++++- + .../bindings/gpio/renesas,rcar-gpio.yaml | 5 + + .../bindings/gpio/socionext,uniphier-gpio.yaml | 17 +++ + arch/arm/mach-davinci/board-da830-evm.c | 3 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 9 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 4 +- + drivers/gpio/Kconfig | 7 +- + drivers/gpio/gpio-amdpt.c | 10 +- + drivers/gpio/gpio-brcmstb.c | 12 +- + drivers/gpio/gpio-cadence.c | 12 +- + drivers/gpio/gpio-dwapb.c | 36 ++--- + drivers/gpio/gpio-grgpio.c | 30 ++--- + drivers/gpio/gpio-hlwd.c | 18 +-- + drivers/gpio/gpio-idt3243x.c | 12 +- + drivers/gpio/gpio-ixp4xx.c | 49 +++---- + drivers/gpio/gpio-loongson1.c | 8 +- + drivers/gpio/gpio-menz127.c | 8 +- + drivers/gpio/gpio-mlxbf2.c | 18 +-- + drivers/gpio/gpio-mmio.c | 22 +-- + drivers/gpio/gpio-pcf857x.c | 14 +- + drivers/gpio/gpio-rcar.c | 7 +- + drivers/gpio/gpio-realtek-otto.c | 137 ++++++++++++++++++- + drivers/gpio/gpio-sifive.c | 12 +- + drivers/gpio/gpio-syscon.c | 49 +++---- + drivers/gpio/gpio-tb10x.c | 4 +- + drivers/gpio/gpiolib-cdev.c | 66 ++++----- + drivers/gpio/gpiolib-of.c | 3 +- + drivers/gpio/gpiolib-sysfs.c | 3 +- + drivers/gpio/gpiolib.c | 75 +++++------ + drivers/gpio/gpiolib.h | 11 +- + drivers/irqchip/irq-ixp4xx.c | 126 +---------------- + drivers/pinctrl/meson/Kconfig | 2 +- + drivers/pinctrl/meson/pinctrl-meson.c | 52 ++++--- + drivers/pinctrl/meson/pinctrl-meson.h | 28 ++-- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 34 ++--- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 150 +++++++++------------ + drivers/pinctrl/renesas/pinctrl-rza1.c | 47 ++----- + drivers/pinctrl/samsung/pinctrl-exynos.c | 8 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 2 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 30 ++--- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 80 +++++------ + include/linux/gpio/driver.h | 30 ++++- + include/linux/irqchip/irq-ixp4xx.h | 12 -- + include/linux/platform_data/pcf857x.h | 2 +- + 47 files changed, 700 insertions(+), 668 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-consumer-common.yaml + delete mode 100644 include/linux/irqchip/irq-ixp4xx.h +Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (a985730491d1 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt +Auto-merging MAINTAINERS +Auto-merging arch/mips/boot/dts/ralink/mt7621.dtsi +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c +CONFLICT (content): Merge conflict in drivers/pinctrl/stm32/pinctrl-stm32.c +Auto-merging include/linux/gpio/driver.h +Resolved 'Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt' using previous resolution. +Resolved 'drivers/pinctrl/stm32/pinctrl-stm32.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 03f2aa7feb4f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/interrupt-controller/qcom,pdc.txt | 1 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 4 +- + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 87 ---- + .../bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 113 +++++ + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 72 +++ + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 42 -- + .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 116 +++++ + .../bindings/pinctrl/pinctrl-mt8192.yaml | 155 +++--- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 2 + + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 115 +++++ + ...trl.yaml => qcom,sm8250-lpass-lpi-pinctrl.yaml} | 2 +- + .../bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 91 ++++ + ...2880-pinmux.yaml => ralink,mt7621-pinctrl.yaml} | 27 +- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 68 +++ + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 92 ++++ + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 71 +++ + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 2 + + MAINTAINERS | 7 + + arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +- + drivers/gpio/gpio-rockchip.c | 29 +- + drivers/gpio/gpiolib-of.c | 5 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 17 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 18 + + drivers/pinctrl/mediatek/Kconfig | 1 + + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson-s4.c | 3 +- + drivers/pinctrl/mvebu/Kconfig | 4 + + drivers/pinctrl/mvebu/Makefile | 1 + + drivers/pinctrl/mvebu/pinctrl-ac5.c | 261 ++++++++++ + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 7 +- + drivers/pinctrl/pinctrl-ingenic.c | 118 +++-- + drivers/pinctrl/pinctrl-max77620.c | 1 - + drivers/pinctrl/pinctrl-ocelot.c | 26 +- + drivers/pinctrl/pinctrl-rockchip.c | 532 +++++++++++++++++---- + drivers/pinctrl/pinctrl-rockchip.h | 177 ++++++- + drivers/pinctrl/pinctrl-thunderbay.c | 7 +- + drivers/pinctrl/qcom/Kconfig | 19 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 309 ++---------- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 86 ++++ + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 167 +++++++ + drivers/pinctrl/qcom/pinctrl-sm8150.c | 22 + + drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 163 +++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/ralink/Kconfig | 28 +- + drivers/pinctrl/ralink/Makefile | 4 +- + drivers/pinctrl/ralink/pinctrl-mt7620.c | 302 ++++++------ + drivers/pinctrl/ralink/pinctrl-mt7621.c | 76 +-- + drivers/pinctrl/ralink/pinctrl-ralink.c | 349 ++++++++++++++ + .../pinctrl/ralink/{pinmux.h => pinctrl-ralink.h} | 16 +- + drivers/pinctrl/ralink/pinctrl-rt2880.c | 381 ++------------- + drivers/pinctrl/ralink/pinctrl-rt288x.c | 60 --- + drivers/pinctrl/ralink/pinctrl-rt305x.c | 66 +-- + drivers/pinctrl/ralink/pinctrl-rt3883.c | 50 +- + drivers/pinctrl/renesas/Kconfig | 7 +- + drivers/pinctrl/renesas/core.c | 67 +-- + drivers/pinctrl/renesas/gpio.c | 1 - + drivers/pinctrl/renesas/pfc-emev2.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77990.c | 120 ++++- + drivers/pinctrl/renesas/pfc-r8a77995.c | 98 ++++ + drivers/pinctrl/renesas/pfc-sh7722.c | 1 - + drivers/pinctrl/renesas/pfc-sh7723.c | 1 - + drivers/pinctrl/renesas/pfc-sh7724.c | 1 - + drivers/pinctrl/renesas/pfc-sh7734.c | 1 - + drivers/pinctrl/renesas/pfc-sh7757.c | 1 - + drivers/pinctrl/renesas/pfc-sh7785.c | 1 - + drivers/pinctrl/renesas/pfc-sh7786.c | 1 - + drivers/pinctrl/renesas/pfc-shx3.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 200 +++++--- + drivers/pinctrl/renesas/pinctrl.c | 1 - + drivers/pinctrl/renesas/sh_pfc.h | 7 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 82 ++-- + drivers/pinctrl/stm32/pinctrl-stm32.h | 1 + + drivers/pinctrl/stm32/pinctrl-stm32mp135.c | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 2 +- + include/linux/gpio/driver.h | 12 + + 78 files changed, 3484 insertions(+), 1511 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,ac5-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,lpass-lpi-pinctrl.yaml => qcom,sm8250-lpass-lpi-pinctrl.yaml} (97%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{ralink,rt2880-pinmux.yaml => ralink,mt7621-pinctrl.yaml} (63%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml + create mode 100644 drivers/pinctrl/mvebu/pinctrl-ac5.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c + create mode 100644 drivers/pinctrl/ralink/pinctrl-ralink.c + rename drivers/pinctrl/ralink/{pinmux.h => pinctrl-ralink.h} (75%) + delete mode 100644 drivers/pinctrl/ralink/pinctrl-rt288x.c +Merging pinctrl-intel/for-next (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (f7bc5f52d235 pinctrl: renesas: rzg2l: Restore pin config order) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (2bf8ee0faa98 dt-bindings: pwm: Add interrupts property for MediaTek MT8192) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 47 +++ + .../devicetree/bindings/pwm/atmel-pwm.txt | 35 --- + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 75 +++++ + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 45 --- + .../bindings/pwm/sunplus,sp7021-pwm.yaml | 42 +++ + .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 92 ++++++ + MAINTAINERS | 14 +- + arch/microblaze/kernel/timer.c | 4 + + drivers/pwm/Kconfig | 25 ++ + drivers/pwm/Makefile | 2 + + drivers/pwm/pwm-atmel-tcb.c | 14 +- + drivers/pwm/pwm-clps711x.c | 68 ++--- + drivers/pwm/pwm-lp3943.c | 42 ++- + drivers/pwm/pwm-raspberrypi-poe.c | 2 +- + drivers/pwm/pwm-sun4i.c | 18 +- + drivers/pwm/pwm-sunplus.c | 232 +++++++++++++++ + drivers/pwm/pwm-xilinx.c | 321 +++++++++++++++++++++ + include/clocksource/timer-xilinx.h | 73 +++++ + 18 files changed, 995 insertions(+), 156 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt + create mode 100644 Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/timer/xlnx,xps-timer.yaml + create mode 100644 drivers/pwm/pwm-sunplus.c + create mode 100644 drivers/pwm/pwm-xilinx.c + create mode 100644 include/clocksource/timer-xilinx.h +Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging fs/io_uring.c +Auto-merging include/linux/posix-timers.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/signal.c +Auto-merging kernel/time/posix-cpu-timers.c +Auto-merging mm/memcontrol.c +Merge made by the 'ort' strategy. + include/linux/ipc_namespace.h | 37 ++++++++- + ipc/ipc_sysctl.c | 189 +++++++++++++++++++++++++++--------------- + ipc/mq_sysctl.c | 121 +++++++++++++++------------ + ipc/mqueue.c | 10 +-- + ipc/namespace.c | 10 +++ + 5 files changed, 235 insertions(+), 132 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (c7b607fa9325 selftests/resctrl: Fix null pointer dereference on open failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/Makefile | 2 + + .../selftests/filesystems/binderfs/binderfs_test.c | 3 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 ++ + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 ++ + tools/testing/selftests/kselftest.h | 15 +++++++ + tools/testing/selftests/mqueue/mq_perf_tests.c | 4 +- + tools/testing/selftests/resctrl/Makefile | 19 +++------ + tools/testing/selftests/resctrl/README | 39 +++++++++++++---- + tools/testing/selftests/resctrl/cat_test.c | 2 +- + tools/testing/selftests/resctrl/fill_buf.c | 4 +- + tools/testing/selftests/resctrl/resctrl.h | 5 ++- + tools/testing/selftests/resctrl/resctrl_tests.c | 49 +++++++++++++++------- + tools/testing/selftests/resctrl/resctrl_val.c | 1 + + tools/testing/selftests/resctrl/resctrlfs.c | 2 +- + tools/testing/selftests/resctrl/settings | 3 ++ + tools/testing/selftests/vm/pkey-x86.h | 21 +--------- + tools/testing/selftests/x86/amx.c | 24 ++++------- + .../testing/selftests/x86/corrupt_xstate_header.c | 16 +------ + 18 files changed, 123 insertions(+), 93 deletions(-) + create mode 100644 tools/testing/selftests/resctrl/settings +Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (d43fae7c4d3e testing: nvdimm: asm/mce.h is not needed in nfit.c) +$ 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 +Merge made by the 'ort' strategy. + drivers/nvdimm/security.c | 5 ----- + tools/testing/nvdimm/test/iomap.c | 18 ++++++++---------- + tools/testing/nvdimm/test/nfit.c | 3 --- + 3 files changed, 8 insertions(+), 18 deletions(-) +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging seccomp/for-next/seccomp (662340ef9218 selftests/seccomp: Ensure that notifications come in FIFO order) +$ 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 +Merge made by the 'ort' strategy. + kernel/seccomp.c | 2 +- + tools/testing/selftests/seccomp/Makefile | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 187 +++++++++++++++++++++++++- + 3 files changed, 183 insertions(+), 7 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ctrl.c | 4 ++-- + drivers/slimbus/qcom-ngd-ctrl.c | 10 ++++------ + 2 files changed, 6 insertions(+), 8 deletions(-) +Merging nvmem/for-next (0f07cbb92a28 nvmem: sfp: Add support for TA 2.1 devices) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/apple,efuses.yaml | 50 ++++++++++++++ + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 30 +++++++- + MAINTAINERS | 2 + + drivers/nvmem/Kconfig | 13 ++++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/apple-efuses.c | 80 ++++++++++++++++++++++ + drivers/nvmem/brcm_nvram.c | 4 ++ + drivers/nvmem/core.c | 1 + + drivers/nvmem/layerscape-sfp.c | 36 +++++++--- + drivers/nvmem/qfprom.c | 3 +- + include/linux/nvmem-consumer.h | 1 + + 11 files changed, 209 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/apple,efuses.yaml + create mode 100644 drivers/nvmem/apple-efuses.c +Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (455880dfe292 PCI: hv: Fix hv_arch_irq_unmask() for multi-MSI) +$ 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 include/linux/hyperv.h +Merge made by the 'ort' strategy. + drivers/hv/channel.c | 116 ++++++++++++++++++++++++++---------- + drivers/hv/channel_mgmt.c | 9 ++- + drivers/hv/hyperv_vmbus.h | 2 +- + drivers/hv/ring_buffer.c | 46 +++++++------- + drivers/pci/controller/pci-hyperv.c | 91 +++++++++++++++++++++------- + include/linux/hyperv.h | 87 ++++++++++++++++----------- + net/vmw_vsock/hyperv_transport.c | 21 +++++-- + 7 files changed, 250 insertions(+), 122 deletions(-) +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (38289a26e1b8 kunit: fix debugfs code to use enum kunit_status, not bool) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging drivers/thunderbolt/test.c +CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c +Auto-merging net/mctp/test/route-test.c +CONFLICT (content): Merge conflict in net/mctp/test/route-test.c +Auto-merging security/apparmor/policy_unpack_test.c +CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c +Resolved 'drivers/thunderbolt/test.c' using previous resolution. +Resolved 'net/mctp/test/route-test.c' using previous resolution. +Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0543c9a7ad25] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/api/index.rst | 5 + + Documentation/dev-tools/kunit/api/resource.rst | 13 + + Documentation/dev-tools/kunit/running_tips.rst | 3 +- + Documentation/dev-tools/kunit/usage.rst | 19 +- + drivers/thunderbolt/test.c | 134 ++++---- + include/kunit/resource.h | 318 +++++++++++++++++++ + include/kunit/test.h | 416 +++++++------------------ + lib/kunit/Makefile | 1 + + lib/kunit/debugfs.c | 2 +- + lib/kunit/kunit-example-test.c | 16 + + lib/kunit/kunit-test.c | 37 ++- + lib/kunit/resource.c | 129 ++++++++ + lib/kunit/test.c | 141 ++------- + lib/list-test.c | 397 ++++++++++++++++++++++- + lib/test_kasan.c | 2 +- + mm/kfence/.kunitconfig | 6 + + mm/kfence/kfence_test.c | 31 +- + net/mctp/test/route-test.c | 4 +- + security/apparmor/policy_unpack_test.c | 6 +- + tools/testing/kunit/kunit.py | 54 ++-- + tools/testing/kunit/kunit_config.py | 9 +- + tools/testing/kunit/kunit_json.py | 63 ++-- + tools/testing/kunit/kunit_kernel.py | 53 ++-- + tools/testing/kunit/kunit_parser.py | 7 + + tools/testing/kunit/kunit_tool_test.py | 15 +- + tools/testing/kunit/qemu_config.py | 17 +- + 26 files changed, 1274 insertions(+), 624 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/resource.rst + create mode 100644 include/kunit/resource.h + create mode 100644 lib/kunit/resource.c + create mode 100644 mm/kfence/.kunitconfig +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (aa5c73d9296d bus: mhi: pci_generic: add Telit FN990) +$ 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 MAINTAINERS +Auto-merging drivers/bus/mhi/host/pci_generic.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-mhi | 10 +++ + MAINTAINERS | 2 +- + drivers/bus/mhi/host/boot.c | 22 ++++-- + drivers/bus/mhi/host/init.c | 82 +++++++++++++++-------- + drivers/bus/mhi/host/internal.h | 7 +- + drivers/bus/mhi/host/main.c | 18 +++-- + drivers/bus/mhi/host/pci_generic.c | 118 +++++++++++++++++++++++++++++---- + drivers/bus/mhi/host/pm.c | 24 +++++-- + 8 files changed, 219 insertions(+), 64 deletions(-) +Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (280302f0e8f6 cxl/mbox: Replace NULL check with IS_ERR() after vmemdup_user()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/Makefile +Auto-merging include/linux/pm.h +Auto-merging kernel/power/main.c +Merge made by the 'ort' strategy. + drivers/Makefile | 2 +- + drivers/cxl/Kconfig | 4 + + drivers/cxl/Makefile | 2 +- + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/mbox.c | 334 ++++++++++++++++++++++++++----------------- + drivers/cxl/core/suspend.c | 24 ++++ + drivers/cxl/cxlmem.h | 71 ++++++++- + drivers/cxl/mem.c | 75 +++++----- + drivers/cxl/pci.c | 47 ++++-- + drivers/cxl/pmem.c | 1 - + include/linux/pm.h | 9 ++ + include/uapi/linux/cxl_mem.h | 14 +- + kernel/power/hibernate.c | 2 +- + kernel/power/main.c | 5 +- + kernel/power/suspend.c | 3 +- + tools/testing/cxl/mock_mem.c | 2 +- + 16 files changed, 403 insertions(+), 193 deletions(-) + create mode 100644 drivers/cxl/core/suspend.c +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (736e0f2179d3 efi/arm64: libstub: run image in place if randomized by the loader) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/virt/Kconfig +CONFLICT (content): Merge conflict in drivers/virt/Kconfig +Auto-merging drivers/virt/Makefile +CONFLICT (content): Merge conflict in drivers/virt/Makefile +Auto-merging include/linux/efi.h +Resolved 'drivers/virt/Kconfig' using previous resolution. +Resolved 'drivers/virt/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c3405d51d6e3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/securityfs-secrets-coco | 51 ++++ + Documentation/security/index.rst | 1 + + Documentation/security/secrets/coco.rst | 103 +++++++ + Documentation/security/secrets/index.rst | 9 + + arch/x86/boot/header.S | 4 + + arch/x86/include/asm/efi.h | 5 + + arch/x86/platform/efi/efi.c | 3 + + drivers/firmware/efi/Kconfig | 43 +++ + drivers/firmware/efi/efi.c | 13 +- + drivers/firmware/efi/libstub/arm32-stub.c | 3 +- + drivers/firmware/efi/libstub/arm64-stub.c | 15 +- + drivers/firmware/efi/libstub/efi-stub.c | 2 +- + drivers/firmware/efi/libstub/efistub.h | 77 ++++- + drivers/firmware/efi/libstub/riscv-stub.c | 3 +- + drivers/firmware/efi/libstub/x86-stub.c | 120 +++++++- + drivers/virt/Kconfig | 2 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/efi_secret/Kconfig | 16 + + drivers/virt/coco/efi_secret/Makefile | 2 + + drivers/virt/coco/efi_secret/efi_secret.c | 349 ++++++++++++++++++++++ + include/linux/efi.h | 25 ++ + 21 files changed, 833 insertions(+), 14 deletions(-) + create mode 100644 Documentation/ABI/testing/securityfs-secrets-coco + create mode 100644 Documentation/security/secrets/coco.rst + create mode 100644 Documentation/security/secrets/index.rst + create mode 100644 drivers/virt/coco/efi_secret/Kconfig + create mode 100644 drivers/virt/coco/efi_secret/Makefile + create mode 100644 drivers/virt/coco/efi_secret/efi_secret.c +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (6b2d72729581 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/slab.c +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + Documentation/vm/slub.rst | 64 +++++++++++++++++ + include/linux/slab.h | 15 ++-- + include/linux/slub_def.h | 1 - + include/linux/stackdepot.h | 26 +++++-- + init/Kconfig | 1 + + lib/Kconfig.debug | 1 + + lib/slub_kunit.c | 10 +-- + lib/stackdepot.c | 67 +++++++++++------ + mm/page_owner.c | 9 ++- + mm/slab.c | 29 +++----- + mm/slab.h | 5 +- + mm/slab_common.c | 23 +++--- + mm/slub.c | 174 ++++++++++++++++++++++++++++----------------- + 13 files changed, 282 insertions(+), 143 deletions(-) +Merging random/master (eb3f5d23695b random: mix in timestamps and reseed on system restore) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging arch/mips/include/asm/timex.h +Auto-merging kernel/time/timekeeping.c +Merge made by the 'ort' strategy. + arch/alpha/include/asm/timex.h | 1 + + arch/arm/include/asm/timex.h | 1 + + arch/ia64/include/asm/timex.h | 1 + + arch/m68k/include/asm/timex.h | 2 +- + arch/mips/include/asm/timex.h | 17 ++- + arch/nios2/include/asm/timex.h | 3 + + arch/openrisc/include/asm/timex.h | 1 + + arch/openrisc/kernel/head.S | 9 ++ + arch/parisc/include/asm/timex.h | 3 +- + arch/powerpc/include/asm/timex.h | 1 + + arch/riscv/include/asm/timex.h | 2 +- + arch/s390/include/asm/timex.h | 1 + + arch/sparc/include/asm/timex_32.h | 4 +- + arch/um/include/asm/timex.h | 9 +- + arch/x86/include/asm/timex.h | 9 ++ + arch/x86/include/asm/tsc.h | 7 +- + arch/xtensa/include/asm/timex.h | 6 +- + drivers/char/random.c | 212 ++++++++++++++++++++------------------ + include/linux/timex.h | 8 ++ + kernel/time/timekeeping.c | 10 ++ + 20 files changed, 175 insertions(+), 132 deletions(-) +Merging landlock/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (011150424cd9 rust: avoid all GCC plugins, not just the randstruct one) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging .gitignore +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging include/linux/kallsyms.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging scripts/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kallsyms.c +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29dfbdee9c6b] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 34 + + Documentation/rust/coding-guidelines.rst | 214 ++ + Documentation/rust/general-information.rst | 77 + + Documentation/rust/index.rst | 20 + + Documentation/rust/logo.svg | 357 +++ + Documentation/rust/quick-start.rst | 230 ++ + MAINTAINERS | 15 + + Makefile | 175 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 143 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 376 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2008 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 231 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 561 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2862 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3353 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 531 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 37 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 554 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 560 +++++ + rust/kernel/file.rs | 873 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 237 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 260 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + 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 | 414 ++++ + rust/kernel/random.rs | 42 + + 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 | 592 +++++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 166 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 157 ++ + rust/kernel/sync/mutex.rs | 114 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/rwsem.rs | 149 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/spinlock.rs | 192 ++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 569 +++++ + 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 | 130 + + samples/rust/Makefile | 15 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 + + scripts/generate_rust_target.rs | 227 ++ + 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 +- + 168 files changed, 35289 insertions(+), 64 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 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/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/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging sysctl/sysctl-next (a467257ffe4b kernel/kexec_core: move kexec_core sysctls into 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/kexec_core.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/panic.c +Auto-merging kernel/rcu/rcu.h +CONFLICT (content): Merge conflict in kernel/rcu/rcu.h +Auto-merging kernel/reboot.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sysctl.c +Auto-merging mm/oom_kill.c +Resolved 'kernel/rcu/rcu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 48c671f28c50] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/proc/proc_sysctl.c | 89 +++++++------ + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/ftrace.h | 3 - + include/linux/initrd.h | 2 - + include/linux/latencytop.h | 3 - + include/linux/lockdep.h | 4 - + include/linux/oom.h | 4 - + include/linux/panic.h | 6 - + include/linux/reboot.h | 4 - + include/linux/sched/sysctl.h | 41 ------ + include/linux/writeback.h | 15 --- + init/do_mounts_initrd.c | 22 +++- + kernel/acct.c | 22 +++- + kernel/delayacct.c | 22 +++- + kernel/kexec_core.c | 22 ++++ + kernel/latencytop.c | 41 ++++-- + kernel/locking/lockdep.c | 35 ++++- + kernel/panic.c | 26 +++- + kernel/rcu/rcu.h | 2 + + kernel/reboot.c | 34 ++++- + kernel/sched/core.c | 69 +++++++--- + kernel/sched/deadline.c | 42 ++++-- + kernel/sched/fair.c | 32 ++++- + kernel/sched/rt.c | 63 ++++++++- + kernel/sched/sched.h | 7 + + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 300 ------------------------------------------- + kernel/trace/ftrace.c | 101 +++++++++------ + mm/oom_kill.c | 38 +++++- + mm/page-writeback.c | 104 +++++++++++++-- + 31 files changed, 653 insertions(+), 529 deletions(-) +Merging folio/for-next (5d5754741171 fs: Remove aops->freepage) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging block/fops.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging fs/btrfs/ctree.h +CONFLICT (content): Merge conflict in fs/btrfs/ctree.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/erofs/data.c +Auto-merging fs/erofs/super.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/namei.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/netfs.h +Auto-merging include/linux/pagemap.h +Auto-merging include/trace/events/f2fs.h +Auto-merging mm/page-writeback.c +Auto-merging mm/page_io.c +Auto-merging mm/readahead.c +Auto-merging mm/swapfile.c +Resolved 'fs/btrfs/ctree.h' using previous resolution. +Resolved 'fs/btrfs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2606d75f6f79] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/caching/netfs-api.rst | 4 +- + Documentation/filesystems/fscrypt.rst | 2 +- + Documentation/filesystems/fsverity.rst | 2 +- + Documentation/filesystems/locking.rst | 36 ++-- + Documentation/filesystems/netfs_library.rst | 9 +- + Documentation/filesystems/porting.rst | 2 +- + Documentation/filesystems/vfs.rst | 86 +++++----- + block/fops.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 23 ++- + drivers/scsi/scsicam.c | 8 +- + fs/9p/vfs_addr.c | 23 ++- + fs/adfs/inode.c | 10 +- + fs/affs/file.c | 21 +-- + fs/affs/symlink.c | 5 +- + fs/afs/dir.c | 7 +- + fs/afs/file.c | 28 ++-- + fs/afs/internal.h | 4 +- + fs/afs/write.c | 4 +- + fs/befs/linuxvfs.c | 17 +- + fs/bfs/file.c | 11 +- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/extent_io.c | 14 +- + fs/btrfs/file.c | 9 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 28 ++-- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/relocation.c | 13 +- + fs/btrfs/send.c | 5 +- + fs/buffer.c | 214 ++++++++++++------------ + fs/ceph/addr.c | 32 ++-- + fs/cifs/file.c | 31 ++-- + fs/coda/symlink.c | 7 +- + fs/cramfs/README | 8 +- + fs/cramfs/inode.c | 7 +- + fs/ecryptfs/mmap.c | 15 +- + fs/efs/inode.c | 8 +- + fs/efs/symlink.c | 5 +- + fs/erofs/data.c | 6 +- + fs/erofs/super.c | 16 +- + fs/erofs/zdata.c | 7 +- + fs/exfat/inode.c | 10 +- + fs/ext2/inode.c | 19 +-- + fs/ext4/ext4.h | 2 - + fs/ext4/inline.c | 41 +++-- + fs/ext4/inode.c | 48 +++--- + fs/ext4/move_extent.c | 17 +- + fs/ext4/namei.c | 7 +- + fs/ext4/readpage.c | 4 +- + fs/ext4/verity.c | 9 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 42 ++--- + fs/f2fs/f2fs.h | 11 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/super.c | 2 +- + fs/f2fs/verity.c | 9 +- + fs/fat/inode.c | 10 +- + fs/freevxfs/vxfs_immed.c | 15 +- + fs/freevxfs/vxfs_subr.c | 17 +- + fs/fuse/dir.c | 10 +- + fs/fuse/file.c | 12 +- + fs/gfs2/aops.c | 81 +++++---- + fs/gfs2/inode.h | 2 +- + fs/gfs2/meta_io.c | 4 +- + fs/hfs/extent.c | 6 +- + fs/hfs/hfs_fs.h | 2 + + fs/hfs/inode.c | 38 ++--- + fs/hfsplus/extents.c | 8 +- + fs/hfsplus/hfsplus_fs.h | 2 + + fs/hfsplus/inode.c | 38 ++--- + fs/hostfs/hostfs_kern.c | 9 +- + fs/hpfs/file.c | 10 +- + fs/hpfs/namei.c | 5 +- + fs/hugetlbfs/inode.c | 2 +- + fs/iomap/buffered-io.c | 38 ++--- + fs/iomap/trace.h | 2 +- + fs/isofs/compress.c | 5 +- + fs/isofs/inode.c | 6 +- + fs/isofs/rock.c | 7 +- + fs/jbd2/commit.c | 14 +- + fs/jbd2/transaction.c | 14 +- + fs/jffs2/file.c | 23 ++- + fs/jffs2/fs.c | 2 +- + fs/jffs2/gc.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/jfs/inode.c | 11 +- + fs/jfs/jfs_metapage.c | 21 +-- + fs/libfs.c | 18 +- + fs/minix/inode.c | 11 +- + fs/mpage.c | 20 ++- + fs/namei.c | 28 ++-- + fs/netfs/buffered_read.c | 25 ++- + fs/nfs/dir.c | 9 +- + fs/nfs/file.c | 51 +++--- + fs/nfs/fscache.h | 14 +- + fs/nfs/read.c | 3 +- + fs/nfs/symlink.c | 16 +- + fs/nilfs2/inode.c | 16 +- + fs/nilfs2/recovery.c | 2 +- + fs/ntfs/aops.c | 40 ++--- + fs/ntfs/aops.h | 6 +- + fs/ntfs/attrib.c | 2 +- + fs/ntfs/compress.c | 4 +- + fs/ntfs/file.c | 4 +- + fs/ntfs/inode.c | 4 +- + fs/ntfs/mft.h | 2 +- + fs/ntfs3/file.c | 5 +- + fs/ntfs3/inode.c | 27 ++- + fs/ntfs3/ntfs_fs.h | 5 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 23 +-- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/refcounttree.c | 6 +- + fs/ocfs2/symlink.c | 5 +- + fs/omfs/file.c | 11 +- + fs/orangefs/inode.c | 52 +++--- + fs/qnx4/inode.c | 7 +- + fs/qnx6/inode.c | 6 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 36 ++-- + fs/reiserfs/journal.c | 14 +- + fs/romfs/super.c | 9 +- + fs/squashfs/file.c | 5 +- + fs/squashfs/super.c | 2 +- + fs/squashfs/symlink.c | 5 +- + fs/sysv/itree.c | 10 +- + fs/ubifs/file.c | 41 ++--- + fs/ubifs/super.c | 2 +- + fs/udf/file.c | 14 +- + fs/udf/inode.c | 10 +- + fs/udf/symlink.c | 5 +- + fs/ufs/inode.c | 13 +- + fs/vboxsf/file.c | 5 +- + fs/verity/enable.c | 29 ++-- + fs/xfs/xfs_aops.c | 10 +- + fs/zonefs/super.c | 8 +- + include/linux/bio.h | 5 +- + include/linux/buffer_head.h | 14 +- + include/linux/fs.h | 32 +--- + include/linux/iomap.h | 4 +- + include/linux/jbd2.h | 2 +- + include/linux/mpage.h | 2 +- + include/linux/netfs.h | 4 +- + include/linux/nfs_fs.h | 2 +- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 78 +++++++-- + include/trace/events/ext4.h | 21 +-- + include/trace/events/f2fs.h | 12 +- + kernel/events/uprobes.c | 7 +- + mm/filemap.c | 94 ++++------- + mm/folio-compat.c | 4 +- + mm/memory.c | 4 +- + mm/migrate.c | 2 +- + mm/page-writeback.c | 10 +- + mm/page_io.c | 2 +- + mm/readahead.c | 52 +++--- + mm/secretmem.c | 8 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 2 +- + mm/vmscan.c | 12 +- + 160 files changed, 1222 insertions(+), 1203 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-btrfs-move-btrfs_readpage-to-extent_io.c.patch +Applying: fix up for "btrfs: move btrfs_readpage to extent_io.c" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/extent_io.c +M fs/btrfs/extent_io.h +$ git add -A . +$ git commit -v -a --amend +[master d5d05462c177] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git + Date: Tue May 3 14:47:27 2022 +1000 +$ git am -3 ../patches/0001-fixup-for-mm-fs-Remove-stray-references-to-readpage.patch +Applying: fixup for "mm,fs: Remove stray references to ->readpage" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/erofs/fscache.c +$ git add -A . +$ git commit -v -a --amend +[master 0b97c5853f01] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git + Date: Tue May 3 14:47:27 2022 +1000 +Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Merge made by the 'ort' strategy. + arch/arm/configs/lpc18xx_defconfig | 1 - + arch/arm/configs/mps2_defconfig | 1 - + arch/arm/configs/stm32_defconfig | 1 - + arch/arm/configs/vf610m4_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + fs/Kconfig.binfmt | 6 - + fs/binfmt_flat.c | 239 ++++++++++--------------------------- + 9 files changed, 66 insertions(+), 186 deletions(-) +Merging bitmap/bitmap-for-next (0b109ac32b03 include/linux/find: Fix documentation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/platform/uv/uv_nmi.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/iio/industrialio-trigger.c +Auto-merging drivers/net/dsa/b53/b53_common.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/staging/media/tegra-video/vi.c +Auto-merging kernel/irq/affinity.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++ + arch/alpha/kernel/process.c | 2 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/mm/tlb.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 4 +- + arch/mips/kernel/crash.c | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/watchdog.c | 2 +- + arch/powerpc/xmon/xmon.c | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- + arch/x86/kvm/hyperv.c | 8 +-- + drivers/acpi/numa/srat.c | 2 +- + drivers/firmware/psci/psci_checker.c | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 48 +++++-------- + drivers/iio/industrialio-trigger.c | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 9 ++- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/memstick/core/ms_block.c | 4 +- + drivers/net/dsa/b53/b53_common.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 +-- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 33 +++------ + drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 45 ++++-------- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +- + drivers/perf/thunderx2_pmu.c | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 2 +- + drivers/staging/media/tegra-video/vi.c | 2 +- + include/linux/bitmap.h | 83 ++++++++++++++++++++++ + include/linux/cpumask.h | 50 +++++++++++++ + include/linux/find.h | 6 +- + include/linux/nodemask.h | 40 +++++++++++ + lib/bitmap.c | 54 ++++++++++---- + mm/mempolicy.c | 2 +- + mm/page_alloc.c | 2 +- + mm/vmstat.c | 4 +- + tools/include/linux/bitmap.h | 43 +++++++++++ + tools/lib/bitmap.c | 20 ++++++ + tools/perf/util/pmu.c | 2 +- + 48 files changed, 379 insertions(+), 162 deletions(-) +Merging kspp/for-next/kspp (e6f3b3c9c109 cfi: Use __builtin_function_start) +$ 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 arch/Kconfig +Merge made by the 'ort' strategy. + arch/Kconfig | 5 +- + arch/arm64/include/asm/compiler.h | 16 ----- + arch/x86/include/asm/highmem.h | 1 + + include/linux/compiler-clang.h | 10 +++ + include/linux/highmem-internal.h | 10 +++ + mm/usercopy.c | 97 ++++++++------------------- + scripts/gcc-plugins/randomize_layout_plugin.c | 2 - + security/Kconfig | 13 +--- + security/security.c | 9 ++- + 9 files changed, 54 insertions(+), 109 deletions(-) +Merging kspp-gustavo/for-next/kspp (6bf825b2731d Merge branch 'for-next/kspp-checkpatch' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++-- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/virt/acrn/acrn_drv.h | 10 ++++++---- + drivers/virt/acrn/mm.c | 9 ++++----- + fs/afs/security.c | 3 +-- + include/scsi/libfcoe.h | 3 ++- + include/uapi/linux/wireless.h | 2 +- + scripts/checkpatch.pl | 8 +++++--- + 9 files changed, 24 insertions(+), 21 deletions(-) +Merging mm-stable/mm-stable (059342d1dd4e mm/damon/reclaim: fix the timer always stays active) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/Makefile +CONFLICT (content): Merge conflict in arch/x86/mm/Makefile +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging include/linux/page-flags.h +Auto-merging mm/memory-failure.c +Auto-merging mm/memory.c +Auto-merging mm/mempolicy.c +Auto-merging mm/migrate.c +Auto-merging mm/mremap.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Auto-merging mm/vmstat.c +Auto-merging tools/testing/selftests/cgroup/cgroup_util.c +Resolved 'arch/x86/mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b60bb63a66b4] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v2.rst | 21 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/mm/ksm.rst | 18 + + Documentation/admin-guide/sysctl/vm.rst | 9 + + Documentation/vm/index.rst | 1 + + Documentation/vm/page_owner.rst | 45 +- + Documentation/vm/vmemmap_dedup.rst | 223 +++++++++ + MAINTAINERS | 3 + + arch/arm64/Kconfig | 2 + + arch/arm64/include/asm/mman.h | 24 - + arch/arm64/mm/flush.c | 14 + + arch/arm64/mm/mmap.c | 25 ++ + arch/ia64/kernel/uncached.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/mman.h | 12 - + arch/powerpc/mm/book3s64/pgtable.c | 17 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/mman.h | 6 - + arch/sparc/mm/init_64.c | 12 + + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/pgtable.h | 5 - + arch/x86/include/uapi/asm/mman.h | 14 - + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/pgprot.c | 35 ++ + drivers/block/zram/zram_drv.c | 10 +- + fs/Kconfig | 22 +- + fs/dax.c | 98 +--- + fs/proc/base.c | 22 + + fs/proc/task_mmu.c | 2 - + include/linux/compaction.h | 5 +- + include/linux/hugetlb.h | 4 +- + include/linux/kasan.h | 8 +- + include/linux/memcontrol.h | 4 - + include/linux/memory_hotplug.h | 5 +- + include/linux/migrate.h | 34 +- + include/linux/mm.h | 11 +- + include/linux/mm_types.h | 7 + + include/linux/mman.h | 4 - + include/linux/page-flags.h | 18 +- + include/linux/rmap.h | 3 + + include/linux/shmem_fs.h | 2 +- + include/linux/swapops.h | 8 - + include/linux/vm_event_item.h | 3 + + include/ras/ras_event.h | 1 - + mm/Kconfig | 2 +- + mm/Makefile | 2 +- + mm/compaction.c | 89 ++-- + mm/damon/core-test.h | 36 ++ + mm/damon/core.c | 2 +- + mm/damon/reclaim.c | 27 +- + mm/damon/vaddr-test.h | 8 +- + mm/debug_vm_pgtable.c | 31 +- + mm/hugetlb.c | 95 ++-- + mm/hugetlb_vmemmap.c | 224 ++------- + mm/hugetlb_vmemmap.h | 24 +- + mm/internal.h | 145 ++++-- + mm/kasan/quarantine.c | 52 ++- + mm/khugepaged.c | 4 +- + mm/ksm.c | 8 + + mm/madvise.c | 8 +- + mm/memcontrol.c | 86 ++-- + mm/memory-failure.c | 38 +- + mm/memory.c | 85 ++-- + mm/memory_hotplug.c | 5 +- + mm/mempolicy.c | 12 +- + mm/memremap.c | 1 + + mm/migrate.c | 107 ++--- + mm/mmap.c | 48 +- + mm/mmu_gather.c | 16 +- + mm/mremap.c | 14 +- + mm/page-writeback.c | 17 +- + mm/page_alloc.c | 133 +++--- + mm/page_ext.c | 2 +- + mm/page_isolation.c | 9 +- + mm/page_vma_mapped.c | 17 +- + mm/rmap.c | 68 ++- + mm/shmem.c | 9 +- + mm/sparse-vmemmap.c | 176 +++++++- + mm/sparse.c | 26 +- + mm/vmalloc.c | 5 +- + mm/vmscan.c | 23 +- + mm/vmstat.c | 5 +- + mm/z3fold.c | 64 +-- + tools/testing/selftests/cgroup/cgroup_util.c | 44 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 121 ++++- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 12 +- + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/gup_test.c | 22 +- + tools/testing/selftests/vm/madv_populate.c | 34 +- + tools/testing/selftests/vm/migration.c | 193 ++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 523 ++++------------------ + tools/testing/selftests/vm/soft-dirty.c | 145 ++++++ + tools/testing/selftests/vm/split_huge_page_test.c | 79 +--- + tools/testing/selftests/vm/vm_util.c | 108 +++++ + tools/testing/selftests/vm/vm_util.h | 9 + + tools/vm/page_owner_sort.c | 386 +++++++++++++--- + 100 files changed, 2502 insertions(+), 1679 deletions(-) + create mode 100644 Documentation/vm/vmemmap_dedup.rst + create mode 100644 arch/x86/mm/pgprot.c + create mode 100644 tools/testing/selftests/vm/migration.c + create mode 100644 tools/testing/selftests/vm/soft-dirty.c + create mode 100644 tools/testing/selftests/vm/vm_util.c + create mode 100644 tools/testing/selftests/vm/vm_util.h +Merging mm-nonmm-stable/mm-nonmm-stable (f6e2c20ca760 fs: sysv: check sbi->s_firstdatazone in complete_read_super) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging MAINTAINERS +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/mm/tlb.c +Auto-merging fs/fat/inode.c +Auto-merging init/Kconfig +Auto-merging kernel/hung_task.c +Auto-merging kernel/kexec_core.c +Auto-merging kernel/watchdog.c +Auto-merging lib/Kconfig.debug +Auto-merging scripts/decode_stacktrace.sh +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + arch/alpha/lib/csum_partial_copy.c | 1 - + arch/arm/kernel/crash_dump.c | 27 +- + arch/arm64/kernel/crash_dump.c | 29 +-- + arch/ia64/kernel/crash_dump.c | 32 +-- + arch/ia64/kernel/kprobes.c | 64 ++--- + arch/ia64/kernel/palinfo.c | 2 +- + arch/ia64/kernel/ptrace.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/mm/tlb.c | 4 +- + arch/m68k/lib/checksum.c | 2 - + arch/mips/kernel/crash_dump.c | 27 +- + arch/powerpc/kernel/crash_dump.c | 35 +-- + arch/powerpc/lib/checksum_wrappers.c | 2 - + arch/riscv/kernel/crash_dump.c | 26 +- + arch/s390/kernel/crash_dump.c | 13 +- + arch/sh/kernel/crash_dump.c | 29 +-- + arch/x86/kernel/crash_dump_32.c | 29 +-- + arch/x86/kernel/crash_dump_64.c | 48 ++-- + arch/x86/lib/csum-wrappers_64.c | 2 - + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + fs/fat/fat.h | 9 +- + fs/fat/fatent.c | 7 +- + fs/fat/inode.c | 6 +- + fs/fat/misc.c | 14 +- + fs/ocfs2/dlm/dlmdebug.c | 12 +- + fs/ocfs2/dlm/dlmunlock.c | 21 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/journal.c | 33 ++- + fs/ocfs2/journal.h | 2 + + fs/ocfs2/quota_local.c | 10 +- + fs/ocfs2/reservations.c | 4 +- + fs/ocfs2/reservations.h | 9 +- + fs/ocfs2/super.c | 180 ++++++++----- + fs/pipe.c | 2 +- + fs/proc/kcore.c | 14 +- + fs/proc/vmcore.c | 130 +++++----- + fs/sysv/super.c | 4 +- + include/linux/crash_dump.h | 19 +- + include/linux/list.h | 6 +- + include/linux/pipe_fs_i.h | 2 +- + include/linux/ptrace.h | 2 +- + include/uapi/linux/acct.h | 3 +- + include/uapi/linux/taskstats.h | 24 +- + init/Kconfig | 4 +- + kernel/hung_task.c | 2 +- + kernel/kexec_core.c | 2 - + kernel/pid_namespace.c | 2 +- + kernel/ptrace.c | 6 - + kernel/taskstats.c | 24 ++ + kernel/tsacct.c | 10 +- + kernel/watchdog.c | 4 +- + lib/Kconfig.debug | 21 -- + lib/glob.c | 2 +- + lib/string.c | 25 +- + lib/test_meminit.c | 12 +- + lib/test_string.c | 33 +++ + scripts/bloat-o-meter | 1 + + scripts/decode_stacktrace.sh | 27 +- + scripts/get_maintainer.pl | 1 + + tools/accounting/.gitignore | 1 + + tools/accounting/Makefile | 2 +- + tools/accounting/procacct.c | 417 +++++++++++++++++++++++++++++++ + 64 files changed, 918 insertions(+), 578 deletions(-) + create mode 100644 tools/accounting/procacct.c +Merging mm/mm-everything (cdb5a08f5c15 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging drivers/block/loop.c +Auto-merging fs/cifs/file.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/nfs/file.c +CONFLICT (content): Merge conflict in fs/nfs/file.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/printk.h +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging include/linux/writeback.h +Auto-merging include/uapi/linux/elf.h +Auto-merging init/Kconfig +Auto-merging ipc/mqueue.c +Auto-merging kernel/events/uprobes.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memory.c +Auto-merging mm/mempolicy.c +Auto-merging mm/migrate.c +Auto-merging mm/mremap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page_io.c +CONFLICT (content): Merge conflict in mm/page_io.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.c +Auto-merging mm/slab_common.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Auto-merging tools/testing/selftests/cgroup/cgroup_util.c +Auto-merging tools/testing/selftests/cgroup/cgroup_util.h +Recorded preimage for 'fs/nfs/file.c' +Resolved 'include/linux/slab.h' using previous resolution. +Resolved 'mm/page_io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/nfs/file.c'. +[master 44b29f0638ca] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 25 +- + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 11 + + Documentation/admin-guide/mm/damon/usage.rst | 41 +- + Documentation/admin-guide/sysctl/vm.rst | 30 ++ + Documentation/filesystems/locking.rst | 18 +- + Documentation/filesystems/vfs.rst | 17 +- + Documentation/vm/balance.rst | 2 +- + arch/arm64/include/asm/cache.h | 17 +- + arch/arm64/include/asm/mte-kasan.h | 1 + + arch/arm64/include/asm/percpu.h | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 29 +- + arch/csky/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 31 +- + arch/s390/include/asm/hugetlb.h | 20 + + arch/s390/include/asm/pgtable.h | 36 +- + arch/x86/include/asm/pgtable.h | 22 + + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/pgtable_64_types.h | 5 + + arch/x86/include/asm/pgtable_types.h | 2 + + arch/x86/include/asm/tlbflush.h | 97 +++++ + arch/x86/mm/pgtable.c | 10 + + drivers/block/loop.c | 4 +- + drivers/firmware/smccc/kvm_guest.c | 1 + + drivers/iommu/tegra-smmu.c | 4 +- + drivers/virtio/virtio_mem.c | 6 +- + fs/cifs/file.c | 7 +- + fs/exec.c | 6 +- + fs/fcntl.c | 9 +- + fs/hugetlbfs/inode.c | 15 +- + fs/nfs/direct.c | 23 +- + fs/nfs/file.c | 18 +- + fs/ocfs2/namei.c | 49 ++- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/open.c | 9 +- + fs/overlayfs/file.c | 13 +- + fs/proc/generic.c | 3 + + fs/proc/proc_net.c | 3 + + fs/proc/task_mmu.c | 7 + + fs/userfaultfd.c | 32 +- + include/asm-generic/hugetlb.h | 24 ++ + include/asm-generic/tlb.h | 14 + + include/linux/cma.h | 4 +- + include/linux/damon.h | 13 + + include/linux/fs.h | 4 + + include/linux/gfp.h | 30 +- + include/linux/highmem.h | 2 + + include/linux/huge_mm.h | 5 +- + include/linux/hugetlb.h | 33 +- + include/linux/memcontrol.h | 14 + + include/linux/memory_hotplug.h | 9 + + include/linux/mm.h | 59 ++- + include/linux/mm_inline.h | 43 ++ + include/linux/mm_types.h | 13 + + include/linux/mmzone.h | 5 +- + include/linux/nfs_fs.h | 2 +- + include/linux/page-flags.h | 39 +- + include/linux/page-isolation.h | 6 +- + include/linux/pgtable.h | 51 ++- + include/linux/printk.h | 1 - + include/linux/rmap.h | 118 +++++- + include/linux/shmem_fs.h | 4 +- + include/linux/slab.h | 12 + + include/linux/swap.h | 180 +++------ + include/linux/swapops.h | 134 +++++- + include/linux/userfaultfd_k.h | 84 ++++ + include/linux/writeback.h | 7 + + include/trace/events/mmflags.h | 1 - + include/uapi/linux/elf.h | 2 +- + include/uapi/linux/userfaultfd.h | 10 +- + init/Kconfig | 27 +- + init/initramfs.c | 76 ++-- + init/main.c | 25 +- + ipc/mqueue.c | 14 + + ipc/sem.c | 25 +- + kernel/bpf/bpf_lru_list.h | 1 + + kernel/events/uprobes.c | 2 +- + lib/kstrtox.c | 6 +- + lib/test_printf.c | 8 +- + mm/Kconfig | 34 ++ + mm/damon/core.c | 113 +++++- + mm/damon/reclaim.c | 95 +++-- + mm/damon/sysfs.c | 401 +++++++++++++++--- + mm/damon/vaddr-test.h | 6 +- + mm/damon/vaddr.c | 88 +--- + mm/debug_vm_pgtable.c | 15 + + mm/filemap.c | 5 + + mm/gup.c | 129 +++++- + mm/hmm.c | 2 +- + mm/huge_memory.c | 162 ++++++-- + mm/hugetlb.c | 348 ++++++++++++---- + mm/hugetlb_vmemmap.c | 104 ++++- + mm/hugetlb_vmemmap.h | 4 +- + mm/internal.h | 8 +- + mm/kfence/core.c | 34 ++ + mm/khugepaged.c | 24 +- + mm/ksm.c | 15 +- + mm/madvise.c | 22 +- + mm/memcontrol.c | 25 +- + mm/memory-failure.c | 3 +- + mm/memory.c | 493 +++++++++++++++++------ + mm/memory_hotplug.c | 32 +- + mm/mempolicy.c | 62 +-- + mm/memremap.c | 9 + + mm/migrate.c | 63 ++- + mm/migrate_device.c | 23 +- + mm/mincore.c | 4 +- + mm/mprotect.c | 176 +++++--- + mm/mremap.c | 2 +- + mm/page_alloc.c | 208 +++------- + mm/page_io.c | 251 +++++++++--- + mm/page_isolation.c | 354 +++++++++++++++- + mm/pgtable-generic.c | 8 + + mm/rmap.c | 238 +++++++---- + mm/shmem.c | 319 +++++++-------- + mm/slab.c | 7 +- + mm/slab_common.c | 3 +- + mm/slob.c | 16 +- + mm/swap.h | 157 ++++++++ + mm/swap_slots.c | 14 +- + mm/swap_state.c | 77 ++-- + mm/swapfile.c | 71 +++- + mm/userfaultfd.c | 62 ++- + mm/util.c | 1 + + mm/vmscan.c | 439 ++++++++++---------- + mm/z3fold.c | 97 ++--- + mm/zswap.c | 2 + + tools/include/linux/gfp.h | 3 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/cgroup/cgroup_util.c | 12 + + tools/testing/selftests/cgroup/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_memcontrol.c | 78 ++-- + tools/testing/selftests/damon/sysfs.sh | 1 + + tools/testing/selftests/vm/hugepage-mremap.c | 6 + + tools/testing/selftests/vm/userfaultfd.c | 13 +- + tools/vm/page-types.c | 8 +- + usr/gen_init_cpio.c | 92 +++-- + 141 files changed, 4886 insertions(+), 1928 deletions(-) + create mode 100644 mm/swap.h +$ git am -3 ../patches/shmem_fix_for_mm.patch +Applying: linux-next: build failure after merge of the mm tree +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/huge_mm.h +M mm/shmem.c +$ git add -A . +$ git commit -v -a --amend +[master 1ab209c2a819] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Tue May 3 16:13:08 2022 +1000 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/2)
Rebasing (2/2)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + e94e0f2f0f1f...468e4d4736f3 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (468e4d4736f3 kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + mm/oom_kill.c | 58 ++++++++++++++++++------------------- + tools/testing/selftests/vm/Makefile | 2 +- + 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9dbd70d268b8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220503 |