From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Greg KH' <greg@kroah•com>,
'Linus' <torvalds@linux-foundation•org>
Subject: RE: linux-next: build failure after merge of the s5p tree
Date: Tue, 03 Jan 2012 17:12:54 +0900 [thread overview]
Message-ID: <010601ccc9ef$7e784640$7b68d2c0$%kim@samsung.com> (raw)
In-Reply-To: <20120103180854.e9bff732db50c0fa9afd2967@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> After merging the s5p tree, today's linux-next build (powerpc
> ppc64_defconfig) failed badly. The problem is that you have merged into
> your tree a version of the driver-core tree that I reported broken on Dec
> 28.
>
Oops, sorry that.
> Presumably you merged the driver-core tree to fix up some conflicts I
> have reported. Don't do that, please. Either leave them for Linus to
> fix up, or do a merge of Linus' tree after he has merged the (hopefully
> fixed) driver-core tree during the merge window. Or send him your tree
> unmerged with the merged version available for him to use if he wants to.
>
OK, I see. Firstly, I will rebase my for-next as per your suggestion. As you
know, I just wanted to avoid known conflicts with driver-core tree.
> I have used the s5p tree from next-20111228 for today.
OK.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2012-01-03 8:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-03 7:08 linux-next: build failure after merge of the s5p tree Stephen Rothwell
2012-01-03 8:12 ` Kukjin Kim [this message]
2012-01-03 16:20 ` Linus Torvalds
2012-01-03 16:28 ` Greg KH
2012-01-04 0:42 ` Kukjin Kim
2012-01-04 1:46 ` Linus Torvalds
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='010601ccc9ef$7e784640$7b68d2c0$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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