From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Subject: Re: linux-next: the selinux tree needs cleaning up Date: Wed, 25 Jun 2014 10:14:23 -0400 Message-ID: <3104278.9BN09dqLoQ@sifl> References: <20140618084046.1bce12cc@canb.auug.org.au> <32647147.KmAPzBrbMT@sifl> <20140625095928.3161ebe1@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from mail-qc0-f175.google.com ([209.85.216.175]:57706 "EHLO mail-qc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756294AbaFYOO0 (ORCPT ); Wed, 25 Jun 2014 10:14:26 -0400 Received: by mail-qc0-f175.google.com with SMTP id i8so1731359qcq.20 for ; Wed, 25 Jun 2014 07:14:26 -0700 (PDT) In-Reply-To: <20140625095928.3161ebe1@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Morris , "Serge E. Hallyn" On Wednesday, June 25, 2014 09:59:28 AM Stephen Rothwell wrote: > Well, I see that James has pulled your tree, so past problems are now > moot. He has some duplicate commits in his tree now and Linus will get > a few more when he next pulls James' tree. We just need to avoid this > going forward. And given that James or Serge will, from now on, *pull* > your tree (not cherry-pick from it), things should be fine. Okay, sorry again for the confusion, hopefully we won't have to worry about this again. -- paul moore www.paul-moore.com