Messages in this thread | | | Date | Mon, 22 Sep 2014 07:31:05 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with Linus' tree |
| |
On Mon, Sep 22, 2014 at 03:01:24PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/iio/accel/bma180.c between commit 0668a4e4d297 ("iio: accel: > bma180: Fix indio_dev->trig assignment") from Linus' tree and commit > 16ed8692fa48 ("iio:bma180: Enable use of device without IRQ") from the > staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks, the fix looks correct.
greg k-h
| |