All of lore.kernel.org
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: Pre-merge-window status of the arm-soc tree
Date: Wed, 7 Mar 2012 09:51:01 -0800	[thread overview]
Message-ID: <20120307175100.GH12083@atomide.com> (raw)
In-Reply-To: <201203062054.55434.arnd@arndb.de>

Hi Arnd & Olof,

* Arnd Bergmann <arnd@arndb.de> [120306 12:26]:
> 
> * Russell now has a branch that contains patches from his tree that
> directly impact stuff in arm-soc. We had a lot of nasty conflicts
> the last time around, which resulted in some of the patches from
> arm-soc not making it in during the merge window. Pulling the
> rmk/for-armsoc branch into arm-soc hopefully lets us avoid this
> situation in the future because we will fix the conflicts much
> earlier.

There's also two urgent issues pending for omap in case you
are filtering mails on keywords to make them safe to read :)

See this:

http://www.spinics.net/lists/arm-kernel/msg163661.html

Also, after that is out of the way, I have two more pull request
ready for fixes for various build and warning issues Russell
has reported.

Regards,

Tony 

WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel <linux-kernel@vger.kernel.org>,
	"arm@kernel.org" <arm@kernel.org>,
	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>,
	Sekhar Nori <nsekhar@ti.com>, Jamie Iles <jamie@jamieiles.com>,
	Kevin Hilman <khilman@ti.com>, Kukjin Kim <kgene.kim@samsung.com>,
	Stephen Warren <swarren@nvidia.com>,
	Magnus Damm <magnus.damm@gmail.com>,
	Kristoffer Ericson <kristoffer.ericson@gmail.com>,
	David Brown <davidb@codeaurora.org>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Sascha Hauer <kernel@pengutronix.de>,
	Nicolas Ferre <nicolas.ferre@atmel.com>,
	Rob Herring <rob.herring@calxeda.com>,
	Barry Song <baohua.song@csr.com>,
	Eric Miao <eric.y.miao@gmail.com>,
	Linus Walleij <linus.walleij@stericsson.com>,
	Scott Branden <sbranden@broadcom.com>,
	Jiandong Zheng <jdzheng@broadcom.com>,
	Colin Cross <ccross@android.com>,
	Shawn Guo <shawn.guo@linaro.org>,
	Roland Stigge <stigge@antcom.de>,
	"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: Pre-merge-window status of the arm-soc tree
Date: Wed, 7 Mar 2012 09:51:01 -0800	[thread overview]
Message-ID: <20120307175100.GH12083@atomide.com> (raw)
In-Reply-To: <201203062054.55434.arnd@arndb.de>

Hi Arnd & Olof,

* Arnd Bergmann <arnd@arndb.de> [120306 12:26]:
> 
> * Russell now has a branch that contains patches from his tree that
> directly impact stuff in arm-soc. We had a lot of nasty conflicts
> the last time around, which resulted in some of the patches from
> arm-soc not making it in during the merge window. Pulling the
> rmk/for-armsoc branch into arm-soc hopefully lets us avoid this
> situation in the future because we will fix the conflicts much
> earlier.

There's also two urgent issues pending for omap in case you
are filtering mails on keywords to make them safe to read :)

See this:

http://www.spinics.net/lists/arm-kernel/msg163661.html

Also, after that is out of the way, I have two more pull request
ready for fixes for various build and warning issues Russell
has reported.

Regards,

Tony 

  parent reply	other threads:[~2012-03-07 17:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-06 20:54 Pre-merge-window status of the arm-soc tree Arnd Bergmann
2012-03-06 20:54 ` Arnd Bergmann
2012-03-06 23:53 ` Rafael J. Wysocki
2012-03-06 23:53   ` Rafael J. Wysocki
2012-03-07  7:46 ` Jean-Christophe PLAGNIOL-VILLARD
2012-03-07  7:46   ` Jean-Christophe PLAGNIOL-VILLARD
2012-03-07 17:51 ` Tony Lindgren [this message]
2012-03-07 17:51   ` Tony Lindgren

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=20120307175100.GH12083@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.