From mboxrd@z Thu Jan 1 00:00:00 1970 From: Casey Schaufler Subject: Re: linux-next: unusual update of the security tree Date: Thu, 06 Dec 2012 15:56:41 -0800 Message-ID: <50C130B9.4030207@schaufler-ca.com> References: <20121128101635.d5e864dffc4252ef9d5e1664@canb.auug.org.au> <50B5508D.7050409@schaufler-ca.com> <20121128110132.0082c87680b9b714b8c0689c@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from smtp107.biz.mail.ne1.yahoo.com ([98.138.207.14]:29351 "HELO smtp107.biz.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753731Ab2LFX4c (ORCPT ); Thu, 6 Dec 2012 18:56:32 -0500 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: James Morris Cc: Linus Torvalds , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Casey Schaufler On 12/6/2012 3:21 PM, 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. I have messed up and believe that I understand my error and the impact that it has had on others. I also believe that I understand what I should be doing henceforth. Once I get the word from James I will rebase my tree from his. I will stop doing merges except as recommended.