From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Trond Myklebust <trond.myklebust@fys.uio.no>,
Linus <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: manual merge of the vfs tree with the nfs tree
Date: Sun, 22 Jul 2012 09:56:51 +1000 [thread overview]
Message-ID: <20120722095651.ab20a748e1c22fad075890f3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in fs/cifs/dir.c,
fs/nfs/dir.c, fs/nfs/nfs4proc.c, ipc/mqueue.c, fs/open.c and fs/namei.c
between commits from the nfs tree and commits from the vfs tree.
These were all caused by the rebase of the vfs tree after it had been
merged into the nfs tree. This is one reason you should not rebase a
published tree (especially so close to the merge window).
I fixed up all the conflicts which meant taking some files from one tree
and some from the other. Now, unless the nfs tree is rebuilt (and tested
etc) we will have duplicates of a large number of patches in Linus'
tree :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-07-21 23:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 23:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-11 1:16 Stephen Rothwell
2012-07-02 1:36 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=20120722095651.ab20a748e1c22fad075890f3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=trond.myklebust@fys.uio.no \
--cc=viro@ZenIV.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®