lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Jul 2015 22:12:12 -0400 From: "J. Bruce Fields" <bfields@...ldses.org> To: Trond Myklebust <trond.myklebust@...marydata.com> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Linux Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the nfsd tree with Linus' tree On Wed, Jul 29, 2015 at 09:35:11PM -0400, Trond Myklebust wrote: > Hi Stephen, > > On Wed, Jul 29, 2015 at 9:23 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > 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. Whoops, thanks, I shouldn't have even had that one in my tree.... > Yes, I snuck that declaration into the patch since it was obvious that > we would never want to export _nfs42_proc_llseek(), and because > "sparse" complained. Apologies if that caused a conflict... I actually noticed that, then noticed a bunch of other stuff there had the same problem, then started to make a patch to fix all those in one fell swoop, then decided I was being annoying and dropped it. Um. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists