linux-kernel - linux-next: manual merge of the bjdooks-i2c tree with Linus' 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>] [day] [month] [year] [list]

Message-Id: <20110408132015.ef5da5aa.sfr@canb.auug.org.au>
Date:	Fri, 8 Apr 2011 13:20:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ben Dooks <ben-linux@...ff.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dirk Brandewie <dirk.brandewie@...il.com>,
	Lucas De Marchi <lucas.demarchi@...fusion.mobi>
Subject: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree

Hi Ben,

Today's linux-next merge of the bjdooks-i2c tree got a conflict in
drivers/i2c/busses/i2c-intel-mid.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit 5c7d3e377ddd
("i2c-intel-mid.c: Remove i2c-intel-mid.c") from the bjdooks-i2c tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped