From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 27 May 2022 23:40:01 +0000 (-0700)
Subject: Merge tag 'v5.18' into next
X-Git-Tag: v6.0-rc1~33^2^2~55
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=690e179059e7e89040d1cd564e39761567a8d5dc;p=linux-block.git

Merge tag 'v5.18' into next

Sync up with mainline to get updates to OMAP4 keypad driver and other
upstream goodies.
---

690e179059e7e89040d1cd564e39761567a8d5dc