linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: linux-next: manual merge of the moduleh tree with Linus' tree
Date: Tue, 2 Aug 2011 13:17:49 -0400	[thread overview]
Message-ID: <CAP=VYLq5p0KD5QW-Ae3=MQojcBSGdngbVwbCC_iyh_VzkPkxGA@mail.gmail.com> (raw)
In-Reply-To: <20110802145237.e8b90cff7f6954f6a12d8b3b@canb.auug.org.au>

On Tue, Aug 2, 2011 at 12:52 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au
>
> 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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

  reply	other threads:[~2011-08-02 17:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-02  4:52 linux-next: manual merge of the moduleh tree with Linus' tree Stephen Rothwell
2011-08-02 17:17 ` Paul Gortmaker [this message]
2011-09-28  6:20 Stephen Rothwell
2011-10-25  8:37 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAP=VYLq5p0KD5QW-Ae3=MQojcBSGdngbVwbCC_iyh_VzkPkxGA@mail.gmail.com' \
    --to=paul.gortmaker@windriver.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tomi.valkeinen@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).