From: Robert Richter <robert.richter@cavium.com>
To: Will Deacon <will.deacon@arm.com>
Cc: Tyler Baicar <tbaicar@codeaurora.org>,
christoffer.dall@linaro.org, marc.zyngier@arm.com,
pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk,
catalin.marinas@arm.com, rjw@rjwysocki.net, lenb@kernel.org,
matt@codeblueprint.co.uk, robert.moore@intel.com,
lv.zheng@intel.com, nkaje@codeaurora.org, zjzhang@codeaurora.org,
mark.rutland@arm.com, james.morse@arm.com,
akpm@linux-foundation.org, eun.taik.lee@samsung.com,
sandeepa.s.prabhu@gmail.com, labbott@redhat.com,
shijie.huang@arm.com, rruigrok@codeaurora.org,
paul.gortmaker@windriver.com, tn@semihalf.com, fu.wei@linaro.org,
rostedt@goodmis.org, bristot@redhat.com,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-efi@vger.
Subject: Re: [PATCH V17 00/11] Add UEFI 2.6 and ACPI 6.1 updates for RAS on ARM64
Date: Wed, 21 Jun 2017 15:10:16 +0200 [thread overview]
Message-ID: <20170621131016.GE16981@rric.localdomain> (raw)
In-Reply-To: <20170621130025.GD16981@rric.localdomain>
On 21.06.17 15:00:25, Robert Richter wrote:
> 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.
Turned out this is actually the ras/core branch from tip tree, esp.
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=7bf130e4a065
-Robert
prev parent reply other threads:[~2017-06-21 13:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 20:32 [PATCH V17 00/11] Add UEFI 2.6 and ACPI 6.1 updates for RAS on ARM64 Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 01/11] acpi: apei: read ack upon ghes record consumption Tyler Baicar
2017-06-30 10:10 ` Robert Richter
[not found] ` <20170630101043.GZ658-vWBEXY7mpu582hYKe6nXyg@public.gmane.org>
2017-06-30 16:47 ` Baicar, Tyler
2017-05-19 20:32 ` [PATCH V17 02/11] ras: acpi/apei: cper: add support for generic data v3 structure Tyler Baicar
2017-06-02 14:13 ` Will Deacon
2017-06-06 9:22 ` Ard Biesheuvel
2017-05-19 20:32 ` [PATCH V17 03/11] cper: add timestamp print to CPER status printing Tyler Baicar
2017-06-06 9:25 ` Ard Biesheuvel
2017-05-19 20:32 ` [PATCH V17 04/11] efi: parse ARM processor error Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 05/11] arm64: exception: handle Synchronous External Abort Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 06/11] acpi: apei: handle SEA notification type for ARMv8 Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 07/11] acpi: apei: panic OS with fatal error status block Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 08/11] efi: print unrecognized CPER section Tyler Baicar
2017-06-07 10:08 ` Ard Biesheuvel
2017-05-19 20:32 ` [PATCH V17 09/11] ras: acpi / apei: generate trace event for " Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 10/11] trace, ras: add ARM processor error trace event Tyler Baicar
2017-05-19 20:32 ` [PATCH V17 11/11] arm/arm64: KVM: add guest SEA support Tyler Baicar
2017-05-23 9:30 ` [PATCH V17 00/11] Add UEFI 2.6 and ACPI 6.1 updates for RAS on ARM64 Borislav Petkov
2017-06-07 11:50 ` Will Deacon
[not found] ` <20170607115012.GZ30263-5wv7dgnIgG8@public.gmane.org>
2017-06-20 6:34 ` Robert Richter
2017-06-20 8:49 ` Will Deacon
2017-06-21 13:00 ` Robert Richter
2017-06-21 13:10 ` Robert Richter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170621131016.GE16981@rric.localdomain \
--to=robert.richter@cavium.com \
--cc=akpm@linux-foundation.org \
--cc=bristot@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=eun.taik.lee@samsung.com \
--cc=fu.wei@linaro.org \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=labbott@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger. \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lv.zheng@intel.com \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matt@codeblueprint.co.uk \
--cc=nkaje@codeaurora.org \
--cc=paul.gortmaker@windriver.com \
--cc=pbonzini@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=rkrcmar@redhat.com \
--cc=robert.moore@intel.com \
--cc=rostedt@goodmis.org \
--cc=rruigrok@codeaurora.org \
--cc=sandeepa.s.prabhu@gmail.com \
--cc=shijie.huang@arm.com \
--cc=tbaicar@codeaurora.org \
--cc=tn@semihalf.com \
--cc=will.deacon@arm.com \
--cc=zjzhang@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).