linux-kernel - Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon 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] [day] [month] [year] [list]

Date:	Mon, 21 Feb 2011 13:31:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Guenter Roeck <guenter.roeck@...csson.com>
Cc:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Jean Delvare <khali@...ux-fr.org>
Subject: Re: linux-next: manual merge of the hwmon-staging tree with the
 jdelvare-hwmon tree

Hi Guenter,

On Sun, 20 Feb 2011 18:17:08 -0800 Guenter Roeck <guenter.roeck@...csson.com> wrote:
>
> yes, it would be great if you can carry the fix if it doesn't make too much trouble.
> I don't see an easy way around it.

These sort of conflict fixes are easy to carry ("git rerere" does it for me).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped