linux-kernel - RE: [GIT PULL] Some error injection fixes to queue for 3.11

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1A7043D5F58CCB44A599DFD55ED4C94838515269@FMSMSX106.amr.corp.intel.com>
Date:	Wed, 19 Jun 2013 17:01:52 +0000
From:	"Brown, Len" <len.brown@...el.com>
To:	"Luck, Tony" <tony.luck@...el.com>, Ingo Molnar <mingo@...nel.org>
CC:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"x86@...nel.org" <x86@...nel.org>, Borislav Petkov <bp@...en8.de>,
	"Wysocki, Rafael J" <rafael.j.wysocki@...el.com>
Subject: RE: [GIT PULL] Some error injection fixes to queue for 3.11

> >> 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.

-L
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/