On Tue, Jul 09, 2019 at 12:15:31AM +1000, Stephen Rothwell wrote:
> Hi,
>
> On Mon, 8 Jul 2019 08:45:10 -0400 "J. Bruce Fields"
> wrote:
> >
> > I did a fetch of
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> >
> > and looked at the "master" branch and
Hi,
On Mon, 8 Jul 2019 08:45:10 -0400 "J. Bruce Fields"
wrote:
>
> I did a fetch of
>
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>
> and looked at the "master" branch and couldn't find that vfs commit. Am
> I looking in the wrong place?
Maybe you were just a
On Mon, Jul 08, 2019 at 11:06:33AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/nfsd/nfsctl.c
>
> between commits:
>
> e8a79fb14f6b ("nfsd: add nfsd/clients directory")
>
> from the nfsd tree and commit:
>
> 96a374a35f82 ("vfs:
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/nfsd/nfsctl.c
between commits:
e8a79fb14f6b ("nfsd: add nfsd/clients directory")
from the nfsd tree and commit:
96a374a35f82 ("vfs: Convert nfsctl to use the new mount API")
from the vfs tree.
I fixed it up
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
net/sunrpc/svcsock.c
between commit:
64dbf4dc5496 ("SUNRPC: Simplify TCP receive code")
from the nfsd tree and commit:
aa563d7bca6e ("iov_iter: Separate type from direction and use accessor
functions")
from the vfs
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
net/sunrpc/svcsock.c
between commit:
64dbf4dc5496 ("SUNRPC: Simplify TCP receive code")
from the nfsd tree and commit:
aa563d7bca6e ("iov_iter: Separate type from direction and use accessor
functions")
from the vfs
6 matches
Mail list logo
