Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1195660
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the nfsd tree with Linus' tree |
| Date | 2015-07-30 03:30 +0200 |
| Message-ID | <pRKPv-9Z-7@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in:
fs/nfs/nfs42proc.c
between commit:
bdcc2cd14e4e ("NFSv4.2: handle NFS-specific llseek errors")
from Linus' tree and commit:
0183ae17c741 ("NFSv4.2: handle NFS-specific llseek errors")
from the nfsd tree.
The only difference here is that _nfs42_proc_llseek is static in the
former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the nfsd tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-07-30 03:30 +0200
Re: linux-next: manual merge of the nfsd tree with Linus' tree Trond Myklebust <trond.myklebust@primarydata.com> - 2015-07-30 03:40 +0200
Re: linux-next: manual merge of the nfsd tree with Linus' tree "J. Bruce Fields" <bfields@fieldses.org> - 2015-07-30 04:20 +0200
csiph-web