archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Paul Gortmaker <>
Subject: linux-next: manual merge of the moduleh tree with the  tree
Date: Tue, 25 Oct 2011 19:45:19 +1100	[thread overview]
Message-ID: <> (raw)

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/plat-s5p/dev-tv.c from merge fix patch
"arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the
moduleh tree.

This file has been removed, so I dropped that hunk.
Stephen Rothwell          

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

             reply	other threads:[~2011-10-25  8:45 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  8:45 Stephen Rothwell [this message]
2011-10-26 19:57 ` linux-next: manual merge of the moduleh tree with the tree Paul Gortmaker
2011-10-26 20:48   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-10-13  6:31 Stephen Rothwell
2011-10-04  6:57 Stephen Rothwell
2011-10-04 15:22 ` Jonathan Cameron
2011-10-05  4:18   ` Paul Gortmaker
2011-09-28  6:53 Stephen Rothwell
2011-08-01  3:09 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).