RE: [GIT PULL] Some error injection fixes to queue for 3.11
From: Brown, Len
Date: Wed Jun 19 2013 - 13:02:09 EST
> >> 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.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/