On Thu, Mar 06, 2014 at 04:06:49PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 > ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") > from the staging.current tree and commit 922b81b835c4 ("staging: cxt1e1: > remove space between function name and parenthesis") and a couple of > others from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Now fixed in my tree, thanks. greg k-h -- 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