lkml.org 
[lkml]   [2011]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the staging tree with Linus' tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
commit f791cec85073 ("Subject: fix build breakage in
drivers/staging/iio/industrialio-core.c") from the staging tree.

The former was a more extensive fix (and is upstream), so I used that.
--
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-28 05:21    [W:0.046 / U:1.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site