lkml.org 
[lkml]   [2011]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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-designware-platdrv.c between commit 4311051c358a
("i2c: irq: Remove IRQF_DISABLED") from Linus' tree and commit
f8420b7bf6ce ("fixup merge") from the bjdooks-i2c tree.

I fixed it up (by removing the IRQF_DISABLED flag) but this change should
probably be sent to Linus as it appears to have been fixed up incorrectly
there.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-11-02 02:25    [W:0.063 / U:4.176 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site