linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>,
	'Olof Johansson' <olof@lixom.net>,
	'Arnd Bergmann' <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	'Viresh Kumar' <viresh.kumar@linaro.org>,
	'Alexander Shiyan' <shc_work@mail.ru>,
	"'Rafael J. Wysocki'" <rjw@sisk.pl>
Subject: RE: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Wed, 10 Apr 2013 17:36:49 +0900	[thread overview]
Message-ID: <30ad01ce35c6$8b13cb10$a13b6130$%kim@samsung.com> (raw)
In-Reply-To: <20130410171743.2ffa67388b330991228a6775@canb.auug.org.au>

Stephen Rothwell wrote:
> 
> Hi all,
> 
Hi,

> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 ("cpufreq:
> s3c24xx: move cpufreq driver to drivers/cpufreq") from the pm tree and

As I know, Rafael will drop it in his tree.
http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-cpufreq
-driver-to-drivers-cpufreq.html

> commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
> CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
> dependency on CPU_S3C2412") from the arm-soc tree.
> 
> I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig
> and can carry thefix as necessary (no action is required).
> 
Thanks.

> P.S. those arm-soc tree commits have a bad Author email address ...

Oops :-( it's my fault due to e-mail client problem...

Arnd, it happened in next/dt-exynos, next/mct-exynos and
next/cleanup-samsung branches in my tree.

And I sorted out in my local just now. Could you please re-pull them into
arm-soc? Then, I will push forced. Sorry about that.

- Kukjin

  reply	other threads:[~2013-04-10  8:37 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-10  7:17 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-04-10  8:36 ` Kukjin Kim [this message]
2013-04-11  8:37   ` Olof Johansson
2013-04-19 10:59     ` Kukjin Kim
  -- strict thread matches above, loose matches on Subject: below --
2013-10-29  8:00 Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
2013-08-29  8:04 Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09   ` Lorenzo Pieralisi
2013-09-09 17:22     ` Kevin Hilman
2013-09-10  8:59       ` Lorenzo Pieralisi
2013-08-27  8:33 Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-04-24  6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2012-09-24  9:21 Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson

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='30ad01ce35c6$8b13cb10$a13b6130$%kim@samsung.com' \
    --to=kgene.kim@samsung.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    --cc=shc_work@mail.ru \
    --cc=viresh.kumar@linaro.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).