linux-next: bad commits in the nfs tree

linux-next: bad commits in the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: bad commits in the nfs tree

[Trond Myklebust]

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

Re: linux-next: bad commits in the nfs tree

[Anna Schumaker]

On 06/03/2014 06:46 PM, Trond Myklebust wrote:
> 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...

Sure.  I'll take care of that right away!

Anna
> 
> Thanks
>    Trond
>