On Thu, Sep 29, 2011 at 1:55 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
> ("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
> ("staging: iio: adis16220_core.c: add module.h") from the staging tree
> and commit 6eee8b750254 ("staging: Add module.h to more drivers
> implicitly using it") from the moduleh tree.
>
> The staging commits are a superset of the part of the moduleh commit that
> affects this file, so I dropped the moduleh change (module.h was added in
> different places).
Yep, I'll drop that change; it got re-added when I re-did build testing on the
baseline v3.1-rc6+module.h and saw a build failure. I didn't clue into that
even when I got the same conflict on my test merge with -next content...
Thanks,
Paul.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
