From: "Luck, Tony" <tony.luck@intel.com>
To: "Brown, Len" <len.brown@intel.com>, Ingo Molnar <mingo@kernel.org>
CC: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "x86@kernel.org" <x86@kernel.org>, Borislav Petkov <bp@alien8.de>,
        "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>
Subject: RE: [GIT PULL] Some error injection fixes to queue for 3.11
Thread-Topic: [GIT PULL] Some error injection fixes to queue for 3.11
Thread-Index: AQHObORFa9GDP8n+jkOFyme2gAOIipk9nywA//+diaA=
Date: Wed, 19 Jun 2013 16:40:39 +0000
Message-ID: <3908561D78D1C84285E8C5FCA982C28F2DA87F71@ORSMSX106.amr.corp.intel.com>
References: <51b20612239358173f@agluck-desk.sc.intel.com>
 <20130619115702.GC10599@gmail.com>
 <1A7043D5F58CCB44A599DFD55ED4C948385151A1@FMSMSX106.amr.corp.intel.com>
In-Reply-To: <1A7043D5F58CCB44A599DFD55ED4C948385151A1@FMSMSX106.amr.corp.intel.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 760
Lines: 21

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

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