Re: [PATCH 000/141] V4L/DVB updates part 1

Linus Torvalds
2006-03-21T18:43:23Z

On Tue, 21 Mar 2006, Mauro Carvalho Chehab wrote:
>
> What is sad is that I can't determinate the root cause of this breakage,
> but it seemed to be associated with merging handling at stg or git.

Note that the bad commit has a totally different commit message from any
of your other merges. It was this one:

diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from cb31c70cdf1ac7034bed5f83d543f4888c39888a)
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
AuthorDate: Fri Mar 10 01:30:04 2006 -0300
Commit: Mauro Carvalho Chehab <mchehab@infradead.org>
CommitDate: Fri Mar 10 01:30:04 2006 -0300

Merging Linus tree

:100644 100644 be5ae600f5337dbb14daa8d4cace110486e14f79 81bc51369f59a413108fd8b150c3090541ba49f8 M Documentation/feature-removal-schedule.txt
:100644 100644 75205391b335f85c9b8a599d0d3b4c0dd1a8b41b fc99075e0af47f0b73a2ae2dfb7d19920c604dea M Documentation/kernel-parameters.txt
:100644 100644 9006063e73691da7b68449955a135f7c9317e2cd da677f829f7689966bf09aeda6d89fc4b6a876d1 M arch/alpha/kernel/irq.c
...

ie it does _not_ fit the pattern of your other merges.

Here's an example of a real git merge, with a conflict fixed up:

Merge: 7705a87... 86d720e...
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon Mar 20 06:43:08 2006 -0300

Merge branch 'prev'

Conflicts:

drivers/media/video/em28xx/em28xx-video.c

which is the standard commit message for modern git when a conflict
happened that you needed to fix up before committing.

And here's a couple of your non-conflicting merges:

commit 155ec9e63da962bf26ffc65a4088c6cc935f28db
Merge: 8e2cc1a... 8a59822...
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed Mar 8 12:34:10 2006 -0300

Merge branch 'work-fixes'

commit cb31c70cdf1ac7034bed5f83d543f4888c39888a
Merge: 06b1c30... 044f324...
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed Mar 8 12:33:42 2006 -0300

Merge branch 'work'

which are also clearly generated with git (this is the standard
boilerplate git commit message for a merge with no conflict).

So just the merge message tells me that it wasn't a regular git merge, but
something else.

Linus