From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Charulatha V <charu@ti•com>,
Felipe Contreras <felipe.contreras@gmail•com>,
Tony Lindgren <tony@atomide•com>,
linux-omap@vger•kernel.org
Subject: Re: linux-next: manual merge of the staging-next tree with the omap tree
Date: Tue, 5 Oct 2010 20:36:05 -0700 [thread overview]
Message-ID: <20101006033605.GB5719@kroah.com> (raw)
In-Reply-To: <20101006142110.e757f27c.sfr@canb.auug.org.au>
On Wed, Oct 06, 2010 at 02:21:10PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> arch/arm/plat-omap/devices.c between commit
> f2ce62312650211f6cf665cd6dc519c334c4071e ("OMAP: WDT: Split OMAP1 and
> OMAP2PLUS device registration") from the omap tree and commit
> 90173882ed15a8034d6d162da5f343a2c7d87587 ("omap: add dsp platform
> device") from the staging-next tree.
>
> Just overlapping removal/additions (I think). I fixed it up (see below)
> and can carry the changes as necessary.
Your fixup looks correct to me, thanks for carrying it.
greg k-h
prev parent reply other threads:[~2010-10-06 3:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-06 3:21 linux-next: manual merge of the staging-next tree with the omap tree Stephen Rothwell
2010-10-06 3:36 ` Greg KH [this message]
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=20101006033605.GB5719@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=charu@ti$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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