Groups > linux.kernel > #1195660

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

Path	csiph.com!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the nfsd tree with Linus' tree
Date	Thu, 30 Jul 2015 03:30:01 +0200
Message-ID	<pRKPv-9Z-7@gated-at.bofh.it> (permalink)
X-Original-To	"J. Bruce Fields" <bfields@fieldses.org>
X-Mailer	Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu)
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
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	27
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Trond Myklebust <trond.myklebust@primarydata.com>
X-Original-Date	Thu, 30 Jul 2015 11:23:25 +1000
X-Original-Message-ID	<20150730112325.72240f81@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1195660

Show key headers only | View raw

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

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