* linux-next: manual merge of the spi tree with Linus' tree
@ 2012-11-15 4:01 Stephen Rothwell
2012-11-15 9:32 ` Grant Likely
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-11-15 4:01 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Lars-Peter Clausen, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the spi tree with Linus' tree
2012-11-15 4:01 linux-next: manual merge of the spi tree with Linus' tree Stephen Rothwell
@ 2012-11-15 9:32 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2012-11-15 9:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Lars-Peter Clausen, Mark Brown
On Thu, Nov 15, 2012 at 4:01 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Sorry for the trouble. I've cleaned up my stale tree now.
g.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-15 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-15 4:01 linux-next: manual merge of the spi tree with Linus' tree Stephen Rothwell
2012-11-15 9:32 ` Grant Likely
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.