[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: build failure after merge of the s5p tree
On Tue, Jan 3, 2012 at 4:42 PM, Kukjin Kim <> wrote:
> 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?

Generally, unless the conflicts are *really* bad, just ignore them,
and let me sort them out. It's nice if you mention the fact that there
will be conflicts, and some people also send me a pre-merged tree that
has the conflicts fixed up, but in general it's much better if the
different trees ignore each other - that way we don't have random
merges that mean that I cannot pull one tree without pulling another.

If the conflicts are just insanely bad, I'll ask you to resolve them
for me when I hit them, but in general that's a sign that something
nasty is going on and people are developing in the wrong trees or just
stepping on each others toes too much.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

 \ /
  Last update: 2012-01-04 02:49    [W:0.039 / U:1.112 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site