From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Linus Torvalds' <torvalds@linux-foundation•org>
Cc: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Greg KH' <greg@kroah•com>
Subject: RE: linux-next: build failure after merge of the s5p tree
Date: Wed, 04 Jan 2012 09:42:04 +0900 [thread overview]
Message-ID: <01bb01ccca79$ae1ad770$0a508650$%kim@samsung.com> (raw)
In-Reply-To: <CA+55aFzuEP7poPj_TiC28+T7Xn-6G1Lydt=q5FMVTj_XhOVf3w@mail.gmail.com>
Linus Torvalds wrote:
>
> On Tue, Jan 3, 2012 at 12:12 AM, Kukjin Kim <kgene.kim@samsung•com> wrote:
> >
> > 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.
>
> Please, in general you should *not* rebase on top of other peoples
OK, I will remember. And as a note, I didn't 'rebase' on top of other tree
just 'merge' in the case of having dependency with others and of course if
that is _really_ required. But we know, if the merged tree is rebased,
something wrong will happen :(
> trees either. What's the conflict and why do you need that other tree
> in the first place?
>
The driver-core tree changed usage(?) of sysdev_class and touched some files
and the changed files have been merged into one file for some reason without
driver-core's changes in samsung tree. So I just wanted to avoid the
conflicts. Linus, how should/can I do in this case?
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-04 0:42 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
2012-01-03 16:20 ` Linus Torvalds
2012-01-03 16:28 ` Greg KH
2012-01-04 0:42 ` Kukjin Kim [this message]
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='01bb01ccca79$ae1ad770$0a508650$%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