All of lore.kernel.org
 help / color / mirror / Atom feed
From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] pxa: patches for next merge window
Date: Mon, 1 Mar 2010 11:27:27 +0100	[thread overview]
Message-ID: <20100301102727.GC16049@pengutronix.de> (raw)
In-Reply-To: <20100301101140.GA12088@linux-sh.org>

Hi,

> Out of the non-PXA merge requests, the only conflicts seem to be on
> Kconfig/Makefile bits as usual, being fairly insular beyond that. While
> these are fairly easy to sort out,
Only a nice hint to whoever will merge the different arm trees in the
end: Note that next is (or recently was) broken, because git merged two
arm trees successfully (i.e. didn't result in a conflict) according to
Stephen and broke arch/arm/Kconfig with it.  See

	http://thread.gmane.org/gmane.linux.ports.arm.kernel/75250

for the exact details.

(I don't know if Stephen reports these issues to Linus anyhow, so this
mail might have been sent for nothing.)

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

  reply	other threads:[~2010-03-01 10:27 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-25  2:49 [GIT PULL] pxa: patches for next merge window Eric Miao
2010-02-25 20:51 ` Russell King - ARM Linux
2010-02-25 21:29   ` Russell King - ARM Linux
2010-02-26  2:50     ` Eric Miao
2010-02-26  9:05     ` Eric Miao
2010-02-28 16:14       ` Russell King - ARM Linux
2010-03-01  0:42         ` Nicolas Pitre
2010-03-01 13:23           ` Eric Miao
2010-03-01 15:16             ` Russell King - ARM Linux
2010-03-02  4:48               ` Eric Miao
2010-03-01  9:39         ` Uwe Kleine-König
2010-03-01  9:48           ` Russell King - ARM Linux
2010-03-01 10:11             ` Paul Mundt
2010-03-01 10:27               ` Uwe Kleine-König [this message]
2010-03-02  0:33                 ` Stephen Rothwell
2010-03-01 10:12             ` Uwe Kleine-König
2010-03-01 16:40             ` Linus Torvalds
2010-03-01 16:58               ` Linus Torvalds
2010-03-01 17:07                 ` Russell King - ARM Linux
  -- strict thread matches above, loose matches on Subject: below --
2010-12-22  9:09 Eric Miao

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=20100301102727.GC16049@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --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.