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: Wed, 28 Sep 2011 10:56:06 -0400 [thread overview]
Message-ID: <4E833586.5070401@windriver.com> (raw)
In-Reply-To: <20110928164824.29edfa867dfe583ff5b982e8@canb.auug.org.au>
On 11-09-28 02:48 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> On Wed, 28 Sep 2011 16:44:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the moduleh tree got a conflict in
>> drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
>> ("staging:iio:accel header housekeeping - remove unecessary includes")
>> from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
>> THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
>> tree.
>
> Also drivers/staging/iio/accel/adis16203_ring.c,
> drivers/staging/iio/accel/adis16204_ring.c,
> drivers/staging/iio/accel/adis16209_ring.c,
> drivers/staging/iio/accel/adis16240_ring.c,
> drivers/staging/iio/gyro/adis16260_ring.c and
> drivers/staging/iio/meter/ade7758_ring.c
I've moved the export.h in all of these up near the top to make
the conflict go away.
Thanks,
Paul.
next prev parent reply other threads:[~2011-09-28 14:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 6:44 linux-next: manual merge of the moduleh tree with the staging tree Stephen Rothwell
2011-09-28 6:48 ` Stephen Rothwell
2011-09-28 14:56 ` 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-29 5:55 Stephen Rothwell
2011-09-29 15:15 ` 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=4E833586.5070401@windriver.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).