Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754641AbZINNt1 (ORCPT ); Mon, 14 Sep 2009 09:49:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753405AbZINNt0 (ORCPT ); Mon, 14 Sep 2009 09:49:26 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:54974 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752941AbZINNtZ (ORCPT ); Mon, 14 Sep 2009 09:49:25 -0400 Date: Mon, 14 Sep 2009 09:49:27 -0400 From: Kyle McMartin To: Stephen Rothwell Cc: Kyle McMartin , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , James Morris , linux-parisc@vger.kernel.org Subject: Re: linux-next: manual merge of the security-testing tree with the parisc tree Message-ID: <20090914134927.GF19494@bombadil.infradead.org> References: <20090903154636.e70c50da.sfr@canb.auug.org.au> <20090914153532.2c06eeae.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090914153532.2c06eeae.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 592 Lines: 15 On Mon, Sep 14, 2009 at 03:35:32PM +1000, Stephen Rothwell wrote: > Hi Kyle, > > Overlapping changes. I fixed it up (using the parisc versions and adding > > the extra change from the latter security-testing patch) and can carry > > the fixes as necessary. > > This conflict is now between the parisc tree and Linus' tree ... > You don't say. -- 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/