public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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,
	Steve Sakoman <steve@sakoman•com>,
	Tomi Valkeinen <tomi.valkeinen@ti•com>,
	Keshava Munegowda <keshava_mgowda@ti•com>,
	Felipe Balbi <balbi@ti•com>
Subject: Re: linux-next: manual merge of the usb tree with the omap_dss2 tree
Date: Mon, 7 Mar 2011 08:19:38 -0800	[thread overview]
Message-ID: <20110307161938.GC9088@kroah.com> (raw)
In-Reply-To: <20110307165418.f17fdf4d.sfr@canb.auug.org.au>

On Mon, Mar 07, 2011 at 04:54:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-omap2/board-overo.c between commit fd045fe21361 ("OMAP:
> DSS2: Add DSS2 support for Overo") from the omap_dss2 tree and commits
> 181b250cf532 ("arm: omap: usb: create common enums and structures for
> ehci and ohci") and 9e64bb1e9f06 ("arm: omap: usb: Invoke usbhs core
> device initialization") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks.  Felipe, am I going to have problems merging with Linus when the
.39 merge window opens up because of these omap changes in my tree?

thanks,

greg k-h

     prev parent reply	other threads:[~2011-03-07 16:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07  5:54 linux-next: manual merge of the usb tree with the omap_dss2 tree Stephen Rothwell
2011-03-07 16:19 ` 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=20110307161938.GC9088@kroah.com \
    --to=greg@kroah$(echo .)com \
    --cc=balbi@ti$(echo .)com \
    --cc=keshava_mgowda@ti$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=steve@sakoman$(echo .)com \
    --cc=tomi.valkeinen@ti$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox