From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755866Ab2LNDDv (ORCPT ); Thu, 13 Dec 2012 22:03:51 -0500 Received: from tundra.namei.org ([65.99.196.166]:50261 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754383Ab2LNDDu (ORCPT ); Thu, 13 Dec 2012 22:03:50 -0500 Date: Fri, 14 Dec 2012 14:11:10 +1100 (EST) From: James Morris To: Stephen Rothwell cc: Linus Torvalds , Casey Schaufler , linux-next@vger.kernel.org, Linux Kernel Mailing List Subject: Re: linux-next: unusual update of the security tree In-Reply-To: <20121213132438.7a70a114233057ce22982b7b@canb.auug.org.au> Message-ID: References: <20121128101635.d5e864dffc4252ef9d5e1664@canb.auug.org.au> <50B5508D.7050409@schaufler-ca.com> <20121128110132.0082c87680b9b714b8c0689c@canb.auug.org.au> <20121213132438.7a70a114233057ce22982b7b@canb.auug.org.au> User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 13 Dec 2012, Stephen Rothwell wrote: > Hi James, > > On Fri, 7 Dec 2012 10:21:31 +1100 (EST) James Morris wrote: > > > > On Thu, 6 Dec 2012, Linus Torvalds wrote: > > > > > Have people pulled that thing into anything else? Because quite > > > frankly, I think it's unsalvageable except with a rebase. > > > > AFAIK, only developers such as Casey will have pulled it for development > > purposes. > > > > And sorry, I should be checking the trees I pull from more carefully. > > Are you going to fix this before asking Linus to pull? Yes. -- James Morris