MIME-Version: 1.0
In-Reply-To: <20140604083411.4296bcd5@canb.auug.org.au>
References: <20140604083411.4296bcd5@canb.auug.org.au>
Date: Tue, 3 Jun 2014 18:46:17 -0400
Message-ID: <CAABAsM4hpz_vCK=AbLUzBnVCr3-_5KhJUqif3YP3Yjp+-ojx8w@mail.gmail.com>
Subject: Re: linux-next: bad commits in the nfs tree
From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Anna Schumaker <Anna.Schumaker@netapp.com>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org

On Tue, Jun 3, 2014 at 6:34 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Trond,
>
> I noticed in the nfs tree this morning 2 commits that have been
> cherry-picked from Linus' tree:
>
> cc6d854967ce    Linux 3.15-rc8
> 2b267bb3a8e5    powerpc: Wire renameat2() syscall
>
> These are part of a branch that you merged from Anna Schumaker.  It
> looks like they may have been included when Anna was trying to rebase
> the rest of the branch onto v3.15-rc8?
>
> Please fix this up before asking Linus to pull your tree.
>

Thanks Stephen! We're still ironing out the kinks in a new process for
the NFS client maintenance, and appreciate your patience.

Anna, let's avoid the mess that is 3.15-rc8 for now. Please rebase on
top of commit b5968725f46d (Push the file layout driver into a
subdirectory) from my nfs-for-next branch and retag the resulting
branch using the same commit information as earlier.
I'll pull the new tag once you send the word that all is ready...

Thanks
   Trond
--
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/