Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757282Ab3FSRCE (ORCPT ); Wed, 19 Jun 2013 13:02:04 -0400 Received: from mga14.intel.com ([143.182.124.37]:25503 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756805Ab3FSRCC convert rfc822-to-8bit (ORCPT ); Wed, 19 Jun 2013 13:02:02 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,898,1363158000"; d="scan'208";a="319531480" From: "Brown, Len" To: "Luck, Tony" , Ingo Molnar CC: "linux-kernel@vger.kernel.org" , "x86@kernel.org" , Borislav Petkov , "Wysocki, Rafael J" 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: AQHObORt1ZSLP0h9qU201RCwbN3oWJk9KX8wgACJhoD//5ABoA== Date: Wed, 19 Jun 2013 17:01:52 +0000 Message-ID: <1A7043D5F58CCB44A599DFD55ED4C94838515269@FMSMSX106.amr.corp.intel.com> References: <51b20612239358173f@agluck-desk.sc.intel.com> <20130619115702.GC10599@gmail.com> <1A7043D5F58CCB44A599DFD55ED4C948385151A1@FMSMSX106.amr.corp.intel.com> <3908561D78D1C84285E8C5FCA982C28F2DA87F71@ORSMSX106.amr.corp.intel.com> In-Reply-To: <3908561D78D1C84285E8C5FCA982C28F2DA87F71@ORSMSX106.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.1.200.106] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 981 Lines: 25 > >> 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/