From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PULL] Pull request for for-rmk/samsung5
Date: Thu, 4 Mar 2010 23:16:29 +0000 [thread overview]
Message-ID: <20100304231629.GC24864@trinity.fluff.org> (raw)
In-Reply-To: <20100302234322.GB29715@n2100.arm.linux.org.uk>
On Tue, Mar 02, 2010 at 11:43:22PM +0000, Russell King - ARM Linux wrote:
> On Thu, Feb 25, 2010 at 12:09:19AM +0000, Ben Dooks wrote:
> > git://git.fluff.org/bjdooks/linux.git for-rmk/samsung5
>
> Conflicts in arch/arm/Kconfig and arch/arm/Makefile - please check
> the resulting merge carefully.
>
> Unfortunately, no patch available since devel-stable has multiple
> ancestors.
I've pulled the git tree, and there is one minor problem missed due to
no default support for in any of the s3c_defconfigs for cpu-freq and
the s3c6400_defconfig currently fails with missing iisv4 device.
I can build for-rmk/samsung6 from for-rmk/samsung5 with the fixes for
the audio driver and the cpu-freq in. I'm just awaiting an OK on whether
to merge the header file fix for the s3c-hsotg driver in with this.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
prev parent reply other threads:[~2010-03-04 23:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-25 0:09 [PULL] Pull request for for-rmk/samsung5 Ben Dooks
2010-02-25 20:53 ` Russell King - ARM Linux
2010-02-26 16:09 ` Ben Dooks
2010-02-26 19:59 ` Russell King - ARM Linux
2010-02-28 16:14 ` Ben Dooks
2010-03-02 23:43 ` Russell King - ARM Linux
2010-03-04 23:16 ` Ben Dooks [this message]
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=20100304231629.GC24864@trinity.fluff.org \
--to=ben-linux@fluff.org \
--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 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).