archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Olof Johansson <>, Arnd Bergmann <>,
	Laxman Dewangan <>,
	Stephen Warren <>,
	Mark Brown <>
Subject: linux-next: manual merge of the arm-soc tree with the spi-mb tree
Date: Tue, 2 Oct 2012 15:18:02 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/spi/spi-tegra.c between commit 536a53a300d0 ("spi: remove
completely broken Tegra driver") from the spi-mb tree and commit
5bd276118189 ("spi: tegra: remove support of legacy DMA driver based
access") from the arm-soc tree.

I removed the file and can carry the fix as necessary (no action is

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-10-02  5:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02  5:18 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-04-26  7:06 linux-next: manual merge of the arm-soc tree with the spi-mb tree Stephen Rothwell
2013-04-26  7:21 ` Richard Genoud
2013-04-26  7:48 ` Yang, Wenyou
2012-10-02  5:13 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* 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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).