All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Trond Myklebust <trond.myklebust@primarydata.com>
Subject: linux-next: manual merge of the nfsd tree with Linus' tree
Date: Thu, 30 Jul 2015 11:23:25 +1000	[thread overview]
Message-ID: <20150730112325.72240f81@canb.auug.org.au> (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

             reply	other threads:[~2015-07-30  1:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-30  1:23 Stephen Rothwell [this message]
2015-07-30  1:35 ` linux-next: manual merge of the nfsd tree with Linus' tree Trond Myklebust
2015-07-30  2:12   ` J. Bruce Fields
  -- strict thread matches above, loose matches on Subject: below --
2014-01-29  1:42 Stephen Rothwell
2013-04-03  0:01 Stephen Rothwell
2013-03-01  0:49 Stephen Rothwell
2011-01-06  0:47 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150730112325.72240f81@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bfields@fieldses.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.