Merge tag 'v6.1-rc2' into fixes
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Oct 2022 06:37:21 +0000 (17:37 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Oct 2022 06:37:21 +0000 (17:37 +1100)
commitf98b4d13717a58b15c00880d2ccd24972316b430
treec3b50090ee3ef4b15b7874ae237d76710108674c
parent65722736c3baf29e02e964a09e85c9ef71c48e8d
parent247f34f7b80357943234f93f247a1ae6b6c3a740
Merge tag 'v6.1-rc2' into fixes

Merge rc2 into our fixes branch, which was based on rc1 but wasn't
merged until rc3, so that for the remainder of the release our fixes
branch will be based on rc2 for the purposes of resolving conflicts with
other trees (if necessary).