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

[Greg KH]

On Mon, May 11, 2015 at 03:28:04PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/media/dt3155v4l/dt3155v4l.c between commit cc11b140c3f1
> ("[media] dt3155: move out of staging into drivers/media/pci") from the
> v4l-dvb tree and commit ec80e2428046 ("staging: dt3155v4l: remove
> unused including <linux/version.h>") from the staging tree (which moved
> the file to drivers/media/pci/dt3155/dt3155.c).
> 
> I fixed it up (I just deleted the file from staging - the
> linux/config.h patch needs to be applied to the new file) and can carry
> the fix as necessary (no action is required).

Sounds good, thanks for doing this.

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  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/