Stephen Rothwell <s...@canb.auug.org.au> wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in >drivers/iio/industrialio-buffer.c between commit d66e0452bf6b ("iio: >Fix >crash when scan_bytes is computed with active_scan_mask == NUL") from >the >staging.current tree and commit 705ee2c98a37 ("iio:buffer: Simplify >iio_buffer_is_active()") from the staging tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required).
Thanks Stephen. The merge is correct. Jonathan -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/