linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the moduleh tree with the s5p tree
Date: Thu, 13 Oct 2011 17:25:00 +1100	[thread overview]
Message-ID: <20111013172500.ad9d603304f5b13527b8410d@canb.auug.org.au> (raw)

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

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
arch/arm/plat-s3c24xx/devs.c, arch/arm/plat-s5p/dev-ehci.c,
arch/arm/plat-s5p/dev-onenand.c, arch/arm/plat-samsung/dev-adc.c,
arch/arm/plat-samsung/dev-asocdma.c, arch/arm/plat-samsung/dev-ide.c,
arch/arm/plat-samsung/dev-nand.c, arch/arm/plat-samsung/dev-pwm.c,
arch/arm/plat-samsung/dev-rtc.c, arch/arm/plat-samsung/dev-ts.c,
arch/arm/plat-samsung/dev-usb.c and arch/arm/plat-samsung/dev-wdt.c
between commits from the s5p tree and commits 8d7f68e196ec ("arm: fix
implicit use of asm/sizes.h in plat-s5p/plat-samsung") and 1c28ea1c50da
("arm: Add export.h to ARM specific files as required") from the moduleh
tree.

The s5p tree commits effectively removed these files, so I did that.
Hopefully the fixups from the moduleh tree are no longer required or
covered by other changes.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

                 reply	other threads:[~2011-10-13  6:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20111013172500.ad9d603304f5b13527b8410d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=kgene.kim@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    /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 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).