From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>, Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>,
"Darrick J. Wong" <darrick.wong@oracle•com>
Subject: linux-next: manual merge of the vfs-miklos tree with the vfs tree
Date: Mon, 12 Dec 2016 10:38:17 +1100 [thread overview]
Message-ID: <20161212103817.15e09cc0@canb.auug.org.au> (raw)
Hi Miklos,
Today's linux-next merge of the vfs-miklos tree got a conflict in:
fs/read_write.c
between commit:
a76b5b04375f ("fs: try to clone files first in vfs_copy_file_range")
from the vfs tree and commit:
b2368d2bb4a5 ("vfs: check file types in vfs_copy_file_range()")
from the vfs-miklos tree.
I fixed it up (I used the vfs tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
Darrick, commit a76b5b04375f has no Signed-off-by from you as committer :-(
--
Cheers,
Stephen Rothwell
reply other threads:[~2016-12-11 23:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20161212103817.15e09cc0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=darrick.wong@oracle$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox