Groups > linux.kernel > #1195685

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

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	"J. Bruce Fields" <bfields@fieldses.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the nfsd tree with Linus' tree
Date	Thu, 30 Jul 2015 04:20:01 +0200
Message-ID	<pRLBT-1py-1@gated-at.bofh.it> (permalink)
References	<pRKPv-9Z-7@gated-at.bofh.it> <pRKZb-lk-5@gated-at.bofh.it>
X-Original-To	Trond Myklebust <trond.myklebust@primarydata.com>
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.21 (2010-09-15)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	Stephen Rothwell <sfr@canb.auug.org.au>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
X-Original-Date	Wed, 29 Jul 2015 22:12:12 -0400
X-Original-Message-ID	<20150730021212.GB25234@fieldses.org>
X-Original-References	<20150730112325.72240f81@canb.auug.org.au> <CAHQdGtSeaDoFp2mztbAdk4jTX55ox9Qb+YGV3wKhOF1teZCPXg@mail.gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1195685

Show key headers only | View raw

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@canb.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@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 — Previous in thread | Find similar | Unroll thread

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