[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170621130025.GD16981@rric.localdomain>
Date: Wed, 21 Jun 2017 15:00:25 +0200
From: Robert Richter <robert.richter@...ium.com>
To: Will Deacon <will.deacon@....com>
Cc: Tyler Baicar <tbaicar@...eaurora.org>, christoffer.dall@...aro.org,
marc.zyngier@....com, pbonzini@...hat.com, rkrcmar@...hat.com,
linux@...linux.org.uk, catalin.marinas@....com, rjw@...ysocki.net,
lenb@...nel.org, matt@...eblueprint.co.uk, robert.moore@...el.com,
lv.zheng@...el.com, nkaje@...eaurora.org, zjzhang@...eaurora.org,
mark.rutland@....com, james.morse@....com,
akpm@...ux-foundation.org, eun.taik.lee@...sung.com,
sandeepa.s.prabhu@...il.com, labbott@...hat.com,
shijie.huang@....com, rruigrok@...eaurora.org,
paul.gortmaker@...driver.com, tn@...ihalf.com, fu.wei@...aro.org,
rostedt@...dmis.org, bristot@...hat.com,
linux-arm-kernel@...ts.infradead.org, kvmarm@...ts.cs.columbia.edu,
kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-acpi@...r.kernel.org, linux-efi@...r.kernel.org,
Suzuki.Poulose@....com, punit.agrawal@....com, astone@...hat.com,
harba@...eaurora.org, hanjun.guo@...aro.org, john.garry@...wei.com,
shiju.jose@...wei.com, joe@...ches.com, bp@...en8.de,
rafael@...nel.org, tony.luck@...el.com, gengdongjiu@...wei.com,
xiexiuqi@...wei.com
Subject: Re: [PATCH V17 00/11] Add UEFI 2.6 and ACPI 6.1 updates for RAS on
ARM64
On 20.06.17 09:49:32, Will Deacon wrote:
> Hi Robert,
>
> On Tue, Jun 20, 2017 at 08:34:39AM +0200, Robert Richter wrote:
> > On 07.06.17 12:50:12, Will Deacon wrote:
> >
> > > Thanks, I've pushed this out as:
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/ras-apei
> > >
> > > which I'll merge into for-next/core (and therefore linux-next) either the
> > > end of this week or the beginning of next week. Please take a look if you
> > > get a chance.
> >
> > any reason why there was a roll back of for-next/core?
> >
> > + 0870f692c2ed...e27c7fa015d6 for-next/core -> arm64/for-next/core (forced update)
> >
> > Is it because for-next/ras-apei goes through tip?
>
> No, it's because the RAS stuff ran into horrible conflicts with the UUID
> tree:
>
> https://lkml.org/lkml/2017/6/16/22
>
> Tyler should be rebasing that soon, so hopefully I can requeue that stuff
> this week.
Note there are also conflicts with tip-ras from Borsis' tree.
-Robert
Powered by blists - more mailing lists