Re: linux-next: manual merge of the nfs tree with Linus' tree

2020-12-14 Thread Trond Myklebust
On Tue, 2020-12-15 at 11:24 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the nfs tree got a conflict in: > >   fs/nfs/nfs4proc.c > > between commit: > >   21e31401fc45 ("NFS: Disable READ_PLUS by default") > > from Linus' tree and commit: > >   5c3485bb12c9 ("NFSv4

linux-next: manual merge of the nfs tree with Linus' tree

2020-12-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nfs tree got a conflict in: fs/nfs/nfs4proc.c between commit: 21e31401fc45 ("NFS: Disable READ_PLUS by default") from Linus' tree and commit: 5c3485bb12c9 ("NFSv4.2/pnfs: Don't use READ_PLUS with pNFS yet") from the nfs tree. I fixed it up (see

linux-next: manual merge of the nfs tree with Linus' tree

2017-05-02 Thread Stephen Rothwell
Hi Trond, Today's linux-next merge of the nfs tree got a conflict in: Documentation/admin-guide/kernel-parameters.txt between commit: c0c74acbb60b ("docs: remove all references to AVR32 architecture") from Linus' tree and commit: 6d22323b2e9f ("nfs: remove the objlayout driver") from t

Re: linux-next: manual merge of the nfs tree with Linus' tree

2016-05-18 Thread Weston Andros Adamson
> On May 18, 2016, at 8:40 PM, Stephen Rothwell wrote: > > Hi Trond, > > Today's linux-next merge of the nfs tree got a conflict in: > > fs/nfs/direct.c > > between commit: > > c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") > > from Linus' tree and commit: > >

linux-next: manual merge of the nfs tree with Linus' tree

2016-05-18 Thread Stephen Rothwell
Hi Trond, Today's linux-next merge of the nfs tree got a conflict in: fs/nfs/direct.c between commit: c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") from Linus' tree and commit: ed3743a6d4f3 ("nfs: add debug to directio "good_bytes" counting") from the nfs tre