Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200819143544.155096-1-alex.kluver@hpe.com> <20200819143544.155096-2-alex.kluver@hpe.com>
 <20200915163312.GO14436@zn.tnic> <CAMj1kXHmVhB88qZc-1mHAD1ovNJQnWRBncmQJTR_4+kV0fXG5w@mail.gmail.com>
 <CAMj1kXGvfiqZz-j5=LU0Z6yYCkr24pCz6aJS62QL8cBYUP_S=w@mail.gmail.com> <20200915171910.GQ14436@zn.tnic>
In-Reply-To: <20200915171910.GQ14436@zn.tnic>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 16 Sep 2020 16:09:36 +0300
Message-ID: <CAMj1kXE6PKb==h_154hRKwZLr3Ek+4z4A8FdTHx=co18ww5d3Q@mail.gmail.com>
Subject: Re: [PATCH v2 1/2] edac,ghes,cper: Add Row Extension to Memory Error Record
To:     Borislav Petkov <bp@alien8.de>
Cc:     Alex Kluver <alex.kluver@hpe.com>, linux-edac@vger.kernel.org,
        linux-efi <linux-efi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        mchehab@kernel.org, russ.anderson@hpe.com,
        Dimitri Sivanich <dimitri.sivanich@hpe.com>,
        kluveralex@gmail.com
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, 15 Sep 2020 at 20:19, Borislav Petkov <bp@alien8.de> wrote:
>
> On Tue, Sep 15, 2020 at 08:12:31PM +0300, Ard Biesheuvel wrote:
> > Boris - do you anticipate any conflicts? If so, please take these via
> > the EDAC tree - the CPER code is mostly self contained so I don't
> > expect any conflicts with the EFI tree in that case.
>
> None so far, and I applied them for testing ontop of my EDAC queue for
> 5.10 so it should be all good. But if you want me, I can test-merge your
> branch once ready, just in case...
>

I managed to apply these patches by using a different base and
cherrypicking them into efi/next

I expect to send out a couple of PRs tomorrow, once the bots have had
a go at building the branches. In the meantime, you can take a look at

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git next