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,
	Jonathan Cameron <jic23@cam.ac.uk>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the moduleh tree with the staging tree
Date: Thu, 29 Sep 2011 11:15:24 -0400	[thread overview]
Message-ID: <CAP=VYLp0zFMGtu2mTOvt5avyeGXQYD2NV=2z=anE1RwwyUw7SQ@mail.gmail.com> (raw)
In-Reply-To: <20110929155557.1baa18a46e6dc142a97cf1d0@canb.auug.org.au>

On Thu, Sep 29, 2011 at 1:55 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/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
> ("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
> ("staging: iio: adis16220_core.c: add module.h") from the staging tree
> and commit 6eee8b750254 ("staging: Add module.h to more drivers
> implicitly using it") from the moduleh tree.
>
> The staging commits are a superset of the part of the moduleh commit that
> affects this file, so I dropped the moduleh change (module.h was added in
> different places).

Yep, I'll drop that change; it got re-added when I re-did build testing on the
baseline v3.1-rc6+module.h and saw a build failure.  I didn't clue into that
even when I got the same conflict on my test merge with -next content...

Thanks,
Paul.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

  reply	other threads:[~2011-09-29 15:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-29  5:55 linux-next: manual merge of the moduleh tree with the staging tree Stephen Rothwell
2011-09-29 15:15 ` Paul Gortmaker [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-13  6:20 Stephen Rothwell
2011-10-06  5:31 Stephen Rothwell
2011-09-28  6:44 Stephen Rothwell
2011-09-28  6:48 ` Stephen Rothwell
2011-09-28 14:56   ` Paul Gortmaker
2011-09-28  6:40 Stephen Rothwell
2011-08-24  5:00 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=VYLp0zFMGtu2mTOvt5avyeGXQYD2NV=2z=anE1RwwyUw7SQ@mail.gmail.com' \
    --to=paul.gortmaker@windriver.com \
    --cc=greg@kroah.com \
    --cc=jic23@cam.ac.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).