Re: [GIT PULL] Some error injection fixes to queue for 3.11

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Wednesday, June 19, 2013 05:01:52 PM Brown, Len wrote:
> > >> Pulled, thanks Tony!
> > >>
> > >> Len, are you fine with this route [tip:x86/ras tree] for the
> > >> drivers/acpi/apei/einj.c changes?
> > >
> > > Yes, the RAS guys basically own that code.
> > 
> > These patches also got picked up by Rafael and are in his ACPI tree
> > too.  I think the patches were applied identically, so there should not
> > be any merge conflicts when this all comes back together in the 3.11
> > merge window.
> > 
> > Rafael already had a chat about who will take future apei changes
> > so that we won't have this happen again.
> 
> I think the only real problem with being in two places at once
> is if the patches _change_.   When that happens, you need to
> get them _both_ changed, else merge conflict happens at the worst time.

I dropped the APEI patches from my tree.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.