From: Michael Ellerman Date: Wed, 18 May 2022 14:11:51 +0000 (+1000) Subject: Merge branch 'fixes' into next X-Git-Tag: xarray-6.0~302^2~87 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5fc286f69fc9590c22995fe05dca461fd6295b1;p=users%2Fwilly%2Fxarray.git Merge branch 'fixes' into next Merge our fixes branch from this cycle. In particular this brings in a papr_scm.c change which a subsequent patch has a dependency on. --- a5fc286f69fc9590c22995fe05dca461fd6295b1