Re: linux-next: manual merge of the staging tree with the tip tree

From: Greg KH
Date: Thu Aug 13 2015 - 11:34:47 EST

On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in:
> drivers/staging/ozwpan/ozproto.c
> between commit:
> 5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
> from the tip tree and commit:
> a73e99cb67e7 ("staging: ozwpan: Remove from tree")
> from the staging tree.
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).

Sounds good to me, thanks.

greg k-h
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at