From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>
Subject: linux-next: manual merge of the btrfs tree with Linus' tree
Date: Mon, 3 Feb 2014 11:13:34 +1100 [thread overview]
Message-ID: <20140203111334.784d919d9ccb9c3c702b40ee@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Hi all,
Today's linux-next merge of the btrfs tree got conflicts in lost of files
between commits from Linus' tree and commits from the btrfs tree.
Not only did you rebase/rewrite your tree before asking Linus to pull it,
but you added a whole lot of commits beyond what had been in linux-next!
I have dropped your (now redundant) tree from linux-next for today.
Please clean it up and try a bit harder, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-03 0:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-03 0:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-10 23:03 linux-next: manual merge of the btrfs tree with Linus' tree Stephen Rothwell
2024-01-08 22:54 Stephen Rothwell
2023-10-31 0:18 Stephen Rothwell
2021-10-31 23:53 Stephen Rothwell
2021-11-02 10:42 ` David Sterba
2021-11-02 11:44 ` Stephen Rothwell
2020-10-15 0:35 Stephen Rothwell
2020-10-15 14:42 ` David Sterba
2014-01-29 0:54 Stephen Rothwell
2014-01-29 13:07 ` Michal Nazarewicz
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=20140203111334.784d919d9ccb9c3c702b40ee@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=clm@fb.com \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).