From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Uwe Kleine-K??nig <u.kleine-koenig@pengutronix.de>
Subject: Re: linux-next: manual merge of the genesis tree with Linus' tree
Date: Tue, 13 Jul 2010 10:55:42 +0900 [thread overview]
Message-ID: <20100713015542.GB12728@linux-sh.org> (raw)
In-Reply-To: <20100713112814.39dbd280.sfr@canb.auug.org.au>
On Tue, Jul 13, 2010 at 11:28:14AM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the genesis tree got a conflict in
> arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig
> arch/arm/configs/g4evm_defconfig between commit
> 07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
> Linus' tree and commits 4a539a2023fd2f7384916ef6e7777ad234a00dcd ("ARM:
> mach-shmobile: update defconfigs") and
> 1ddb76fd29da170d77d70b94cdcba74b0d935152 ("ARM: mach-shmobile: update
> ap4evb defconfig for MMC/DMA changes") from the genesis tree.
>
> The changes are far to extensive for me to fix up, so I have used the
> versions from the genesis tree for today.
>
> Paul you should merge in Linus' tree (or rebase) and use Uwe's script on
> your updated config files ...
>
I'll take care of it today, sorry for the trouble!
next prev parent reply other threads:[~2010-07-13 1:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 1:28 linux-next: manual merge of the genesis tree with Linus' tree Stephen Rothwell
2010-07-13 1:55 ` Paul Mundt [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-05 0:53 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:
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=20100713015542.GB12728@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
/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