Return-Path: Received: from mx142.netapp.com ([216.240.21.19]:44900 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbeDFNoP (ORCPT ); Fri, 6 Apr 2018 09:44:15 -0400 Subject: Re: linux-next: bad commits in the nfs-anna tree To: Stephen Rothwell , Trond Myklebust , NFS Mailing List CC: Linux-Next Mailing List , Linux Kernel Mailing List References: <20180406074314.7ae8652e@canb.auug.org.au> From: Anna Schumaker Message-ID: Date: Fri, 6 Apr 2018 09:44:07 -0400 MIME-Version: 1.0 In-Reply-To: <20180406074314.7ae8652e@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 >