Re: linux-next: manual merge of the moduleh tree with Linus' tree

[Paul Gortmaker]

On Tue, Aug 2, 2011 at 12:52 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/video/omap2/dss/rfbi.c between commit 24e6289c029b ("OMAP: DSS2:
> remove extra includes from include/video/omapdss.h") from Linus' tree and
> commit 06e632e042aa ("video: Add export.h for THIS_MODULE/EXPORT_SYMBOL
> to drivers/video") from the moduleh tree.
>
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

I was making some cosmetic changes to commit logs (such as adding Acked-by
etc) and so took the opportunity to just relocate the export.h
addition up higher
and out of the way, which should make this go away for you/Linus.

Thanks for the heads up,
Paul.

> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/video/omap2/dss/rfbi.c
> index 39f4c59,5dbd229..0000000
> --- a/drivers/video/omap2/dss/rfbi.c
> +++ b/drivers/video/omap2/dss/rfbi.c
> @@@ -33,8 -33,7 +33,9 @@@
>  #include <linux/hrtimer.h>
>  #include <linux/seq_file.h>
>  #include <linux/semaphore.h>
>  +#include <linux/platform_device.h>
>  +#include <linux/pm_runtime.h>
> + #include <linux/export.h>
>
>  #include <video/omapdss.h>
>  #include "dss.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/
>
--
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/