From: Greg KH <greg@kroah•com>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: Kukjin Kim <kgene.kim@samsung•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the s5p tree
Date: Tue, 3 Jan 2012 08:28:44 -0800 [thread overview]
Message-ID: <20120103162844.GA26265@kroah.com> (raw)
In-Reply-To: <CA+55aFzuEP7poPj_TiC28+T7Xn-6G1Lydt=q5FMVTj_XhOVf3w@mail.gmail.com>
On Tue, Jan 03, 2012 at 08:20:20AM -0800, 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
> trees either. What's the conflict and why do you need that other tree
> in the first place?
There's lots of merge conflicts with the driver-next tree due to some
changes we made there. We'll work them out before they get pushed to
your tree.
thanks,
greg k-h
next prev parent reply other threads:[~2012-01-03 16:28 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 [this message]
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=20120103162844.GA26265@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kgene.kim@samsung$(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