From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the s5p tree with the arm tree
Date: Wed, 4 Jan 2012 09:07:02 +0000 [thread overview]
Message-ID: <20120104090702.GA28052@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20120104131830.ec4341de50a69f4f3f2c5b7b@canb.auug.org.au>
On Wed, Jan 04, 2012 at 01:18:30PM +1100, Stephen Rothwell wrote:
> Hi Kukjin,
>
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/plat-samsung/include/plat/system-reset.h between commit
> 281c8724c10c ("ARM: restart: Temporary #error to persuade platform
> maintainers to take the restart changes seriously") from the arm tree and
> commit 08c6fc52956c ("ARM: restart: EXYNOS: use new restart hook") from
> the s5p tree.
>
> The arm tree patch seems to have had the desired affect so I used the s5p
> tree version.
Err, what are the Samsung people playing at, merging the patches that
they've sent me for merging into their own tree?
This is a recipe for breakage, especially as the exynos patch depends
on previous patches in my tree _and_ patches in my tree depend on that
patch as well.
Well, we'll see what we end up with when you do the next linux-next,
as by then my public tree should be updated with yesterdays work by
then.
I've a feeling that this coming merge window is going to be a horrible
mess.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2012-01-04 9:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-04 2:18 linux-next: manual merge of the s5p tree with the arm tree Stephen Rothwell
2012-01-04 9:07 ` Russell King [this message]
2012-01-05 0:46 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2012-01-05 1:09 Stephen Rothwell
2012-01-05 2:34 ` Kukjin Kim
2011-12-27 23:36 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-28 8:33 ` Kukjin Kim
2011-12-27 23:21 Stephen Rothwell
2011-12-27 23:17 Stephen Rothwell
2011-12-27 23:07 Stephen Rothwell
2011-12-28 8:01 ` Kukjin Kim
2011-12-05 0:01 Stephen Rothwell
2011-11-22 2:05 Stephen Rothwell
2011-11-22 2:01 Stephen Rothwell
2011-10-11 2:07 Stephen Rothwell
2011-09-22 2:08 Stephen Rothwell
2011-07-20 1:35 Stephen Rothwell
2011-07-20 8:04 ` Russell King
2011-07-20 8:25 ` Stephen Rothwell
2011-07-20 10:38 ` Kukjin Kim
2011-05-23 1:58 Stephen Rothwell
2010-10-17 23:55 Stephen Rothwell
2010-10-18 1:04 ` Kukjin Kim
2010-10-17 23:50 Stephen Rothwell
2010-10-18 0:57 ` Kukjin Kim
2010-10-18 10:39 ` Kukjin Kim
2010-07-30 0:48 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=20120104090702.GA28052@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.