linux-kernel - linux-next: manual merge of the spi 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121115150139.178644970192d226e73e94e6@canb.auug.org.au>
Date:	Thu, 15 Nov 2012 15:01:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Lars-Peter Clausen" <lars@...afoo.de>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: linux-next: manual merge of the spi tree with Linus' tree

Hi Grant,

Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add
AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit
0e312dcca718 ("spi/xcomm: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver")
from the spi tree.

OK, so the former commit added this driver back before v3.6-rc1 with an
author date of 2012-07-20, the latter is adding a slightly modified
version of the dirver with an author date of 2012-05-22.

I used the former version , please sort this out.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped