linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: bad commits in the nfs-anna tree
@ 2018-04-05 21:43 Stephen Rothwell
  2018-04-06 13:44 ` Anna Schumaker
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-04-05 21:43 UTC (permalink / raw)
  To: Anna Schumaker, Trond Myklebust, NFS Mailing List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

It looks like part of Linus' tree has been rebased into the nfs-anna tree ... commits

  4c8936622a01 ("btrfs: use kvzalloc to allocate btrfs_fs_info")
to
  8f1cd0ae48f5 ("Linux 4.16-rc4")

in the nfs-anna tree are the same as commits

  a8fd1f717493 ("btrfs: use kvzalloc to allocate btrfs_fs_info")
to
  661e50bc8532 ("Linux 4.16-rc4")

I can't use the nfs-anna tree as it is, please fis it up.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: bad commits in the nfs-anna tree
  2018-04-05 21:43 linux-next: bad commits in the nfs-anna tree Stephen Rothwell
@ 2018-04-06 13:44 ` Anna Schumaker
  2018-04-06 14:41   ` Stephen Rothwell
  0 siblings, 1 reply; 3+ messages in thread
From: Anna Schumaker @ 2018-04-06 13:44 UTC (permalink / raw)
  To: Stephen Rothwell, Trond Myklebust, NFS Mailing List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List



On 04/05/2018 05:43 PM, Stephen Rothwell wrote:
> Hi all,
> 
> It looks like part of Linus' tree has been rebased into the nfs-anna tree ... commits
> 
>   4c8936622a01 ("btrfs: use kvzalloc to allocate btrfs_fs_info")
> to
>   8f1cd0ae48f5 ("Linux 4.16-rc4")
> 
> in the nfs-anna tree are the same as commits
> 
>   a8fd1f717493 ("btrfs: use kvzalloc to allocate btrfs_fs_info")
> to
>   661e50bc8532 ("Linux 4.16-rc4")
> 
> I can't use the nfs-anna tree as it is, please fis it up.

Weird.  I removed a few patches from the middle of my tree after finding a bug, but I guess I gave my interactive rebase a slightly too wide range.  It should be fixed now.

Anna
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: bad commits in the nfs-anna tree
  2018-04-06 13:44 ` Anna Schumaker
@ 2018-04-06 14:41   ` Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-04-06 14:41 UTC (permalink / raw)
  To: Anna Schumaker
  Cc: Trond Myklebust, NFS Mailing List, Linux-Next Mailing List,
	Linux Kernel Mailing List

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

Hi Anna,

On Fri, 6 Apr 2018 09:44:07 -0400 Anna Schumaker <Anna.Schumaker@Netapp.com> wrote:
>
> Weird.  I removed a few patches from the middle of my tree after
> finding a bug, but I guess I gave my interactive rebase a slightly
> too wide range.  It should be fixed now.

Thanks.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-04-06 14:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-05 21:43 linux-next: bad commits in the nfs-anna tree Stephen Rothwell
2018-04-06 13:44 ` Anna Schumaker
2018-04-06 14:41   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).