linux-kernel - Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130620110610.7d245d88b70620fa271a29f7@canb.auug.org.au>
Date:	Thu, 20 Jun 2013 11:06:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ming Lei <ming.lei@...onical.com>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Takashi Iwai <tiwai@...e.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 driver-core.current tree

Hi Ming,

On Thu, 20 Jun 2013 08:23:30 +0800 Ming Lei <ming.lei@...onical.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@...il.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped