From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ming Lei <ming.lei@canonical.com>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Thu, 20 Jun 2013 11:06:10 +1000 [thread overview]
Message-ID: <20130620110610.7d245d88b70620fa271a29f7@canb.auug.org.au> (raw)
In-Reply-To: <CACVXFVNsbBunNzYecUG34sFjPqRuzMHRTBD2Siy9d4RhqPnr3A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 784 bytes --]
Hi Ming,
On Thu, 20 Jun 2013 08:23:30 +0800 Ming Lei <ming.lei@canonical.com> wrote:
>
> Yes, I already merged the two branches together in my local repository,
> and there is one merge commit, but I don't know how to generate/format
> patch for this merge commit only:
>
> commit e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d
> Merge: bb07b00 8759793
> Author: Ming Lei <tom.leiming@gmail.com>
> Date: Wed Jun 19 23:56:05 2013 +0800
>
> firmware loader: fix conflict driver-core-linus and driver-core-next
>
> Conflicts:
> drivers/base/firmware_class.c
>
> Anyone who knows, please let me know, thanks.
Try "git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d"
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-06-20 1:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 5:32 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2013-06-19 5:55 ` Greg KH
2013-06-19 6:58 ` Ming Lei
2013-06-19 14:39 ` Greg KH
2013-06-19 15:04 ` Ming Lei
2013-06-19 16:36 ` Greg KH
2013-06-20 0:23 ` Ming Lei
2013-06-20 1:06 ` Stephen Rothwell [this message]
2013-06-20 1:22 ` Ming Lei
2013-06-20 3:28 ` Greg KH
2013-06-20 3:46 ` Ming Lei
2013-06-20 3:49 ` Stephen Rothwell
2013-06-19 7:12 ` Stephen Rothwell
2013-06-19 7:21 ` Ming Lei
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 4:25 Stephen Rothwell
2020-04-30 8:15 ` Greg KH
2013-12-09 3:47 Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2012-02-03 3:51 Stephen Rothwell
2012-02-03 15:07 ` Greg KH
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=20130620110610.7d245d88b70620fa271a29f7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=tiwai@suse.de \
/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).