Hi Ming, On Thu, 20 Jun 2013 08:23:30 +0800 Ming Lei <ming.lei@xxxxxxxxxxxxx> 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@xxxxxxxxx> > 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@xxxxxxxxxxxxxxxx
Attachment:
pgpLqw_iReADN.pgp
Description: PGP signature
