archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Jiri Kosina <>
	John Crispin <>,
	Ralf Baechle <>,
	Masanari Iida <>
Subject: linux-next: manual merge of the trivial tree with the mips tree
Date: Tue, 22 May 2012 14:50:41 +1000	[thread overview]
Message-ID: <> (raw)

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/mips/pci/pci-lantiq.c between commit 57c8cb8f2429 ("MIPS: pci:
convert lantiq driver to OF") from the mips tree and commit 6997991ab0db
("mips: Fix printk typos in arc/mips") from the trivial tree.

The former did the fix from the latter as a side effect so I used that.
Stephen Rothwell          

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

             reply	other threads:[~2012-05-22  4:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-22  4:50 Stephen Rothwell [this message]
2012-05-22  9:01 ` linux-next: manual merge of the trivial tree with the mips tree Jiri Kosina
  -- strict thread matches above, loose matches on Subject: below --
2013-01-23  3:03 Stephen Rothwell
2013-01-23  3:06 ` Stephen Rothwell
2011-10-14  3:31 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).