From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Ball <cjb@laptop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kukjin Kim <kgene.kim@samsung.com>,
Linus <torvalds@linux-foundation.org>
Subject: linux-next: manual merge of the mmc tree with the s5p tree
Date: Tue, 27 Mar 2012 14:10:33 +1100 [thread overview]
Message-ID: <20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
Hi Chris,
This conflict has been caused in part because you rebased your tree and
copied some commits that used to be merged into your tree from a shared
branch. Do *not* do that ... BTW, when you rebased those commits into
your tree, you did not sign them either. This is exactly what Linus has
just berated one of the other maintainers for ...
I am not fixing this conflict, I am just using the version of your tree
that I have from next-20120326. Please fix your tree up properly.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-27 3:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 3:10 Stephen Rothwell [this message]
2012-03-27 3:29 ` linux-next: manual merge of the mmc tree with the s5p tree Chris Ball
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 3:59 Stephen Rothwell
2012-02-22 1:49 Stephen Rothwell
2012-02-22 2:19 ` Kukjin Kim
2012-02-22 2:32 ` Kyungmin Park
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=20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cjb@laptop.org \
--cc=kgene.kim@samsung.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