All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: Roger Quadros <rogerq@ti.com>
Cc: Tony Lindgren <tony@atomide.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, Paul Walmsley <paul@pwsan.com>,
	Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 12 Feb 2013 15:53:36 +0100	[thread overview]
Message-ID: <20130212145336.GI20996@sortiz-mobl> (raw)
In-Reply-To: <511A55DB.7040808@ti.com>

Hi Roger,

On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote:
> On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> >> Hi all,
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> >> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> >> pm_lats and early_device code") from the arm-soc tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> > 
> > Thanks again.
> > 
> > Samuel, up to you, but I suggest you just drop these patches for
> > now if still possible unless other patches are based on these.
> > 
> 
> Samuel, please feel free to drop the 20 patches you pulled from me recently.
> 
> I have another set patches that would depend on them and I think it is better if
> both sets go through usb and arm-soc trees. This would avoid some confusion.
> 
> Once you confirm I can add your Acked-by's to them and send fresh pull requests
> to Tony & Greg. Thanks.
I dropped all those patches from my mfd for-next tree now.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

WARNING: multiple messages have this Message-ID (diff)
From: sameo@linux.intel.com (Samuel Ortiz)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 12 Feb 2013 15:53:36 +0100	[thread overview]
Message-ID: <20130212145336.GI20996@sortiz-mobl> (raw)
In-Reply-To: <511A55DB.7040808@ti.com>

Hi Roger,

On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote:
> On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> >> Hi all,
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> >> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> >> pm_lats and early_device code") from the arm-soc tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> > 
> > Thanks again.
> > 
> > Samuel, up to you, but I suggest you just drop these patches for
> > now if still possible unless other patches are based on these.
> > 
> 
> Samuel, please feel free to drop the 20 patches you pulled from me recently.
> 
> I have another set patches that would depend on them and I think it is better if
> both sets go through usb and arm-soc trees. This would avoid some confusion.
> 
> Once you confirm I can add your Acked-by's to them and send fresh pull requests
> to Tony & Greg. Thanks.
I dropped all those patches from my mfd for-next tree now.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

  reply	other threads:[~2013-02-12 14:54 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-11  6:06 linux-next: manual merge of the arm-soc tree with the mfd tree Stephen Rothwell
2013-02-11  6:06 ` Stephen Rothwell
2013-02-11  6:06 ` Stephen Rothwell
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52   ` Tony Lindgren
2013-02-11 18:52   ` Tony Lindgren
2013-02-11 19:08   ` Olof Johansson
2013-02-11 19:08     ` Olof Johansson
2013-02-12 14:46   ` Roger Quadros
2013-02-12 14:46     ` Roger Quadros
2013-02-12 14:46     ` Roger Quadros
2013-02-12 14:53     ` Samuel Ortiz [this message]
2013-02-12 14:53       ` Samuel Ortiz
  -- strict thread matches above, loose matches on Subject: below --
2013-06-28  6:01 Stephen Rothwell
2013-06-28  6:01 ` Stephen Rothwell
2013-06-28  6:01 ` Stephen Rothwell
2013-06-21  5:54 Stephen Rothwell
2013-06-21  5:54 ` Stephen Rothwell
2013-06-21  5:54 ` Stephen Rothwell
2013-06-21  5:59 ` Gupta, Pekon
2013-06-21  5:59   ` Gupta, Pekon
2013-06-21  5:59   ` Gupta, Pekon
2013-02-04  6:04 Stephen Rothwell
2013-02-04  6:04 ` Stephen Rothwell
2013-02-04  6:04 ` Stephen Rothwell
2012-05-01  5:34 Stephen Rothwell
2012-05-01  5:34 ` Stephen Rothwell
2012-05-01  5:34 ` Stephen Rothwell
2012-05-01 22:56 ` Linus Walleij
2012-05-01 22:56   ` Linus Walleij
2012-04-17  3:34 Stephen Rothwell
2012-04-17  3:34 ` Stephen Rothwell
2012-04-17  3:34 ` 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=20130212145336.GI20996@sortiz-mobl \
    --to=sameo@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=balbi@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=paul@pwsan.com \
    --cc=rogerq@ti.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tony@atomide.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.