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] [day] [month] [year] [list]

Message-ID: <1565630.1FKRuXAmOU@vostro.rjw.lan>
Date:	Thu, 20 Jun 2013 01:17 +0200
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	"Brown, Len" <len.brown@...el.com>
Cc:	"Luck, Tony" <tony.luck@...el.com>, Ingo Molnar <mingo@...nel.org>,
	"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

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