On 10/17/2011 12:55 AM, Florian Tobias Schandinat wrote:
Hi Tomi,
On 10/07/2011 07:20 AM, Tomi Valkeinen wrote:
Hi Florian,
Please pull OMAP DSS patches for v3.2 merge window.
Pulled.
Thanks.
Note that there are some conflicts with other trees. The board file
conflicts are trivial, changes in code which just happen to be next to
each other. The LCD driver conflicts are even simpler, there were
changes to them from some other tree, but I have removed the files.
The conflicts have been solved properly by Stephen in linux-next:
https://github.com/sfrothwell/linux-next/commit/3e31b3042760e3906d0a275d7adedfaf55ee5b0a
I also attached the output from git show, as github seems to show the
full diff for the merge commit.
Are you ok with the conflicts?
No problem.
Well, as I understand, Linus prefers to see (and solve) these conflicts himself,
so I don't have any work with them at all. I'd only have to resolve them if
Linus gave up and that would probably point to a more fundamental issue in the
workflow, like changes going mainline via the wrong tree or such things.
This is also my understanding. However, Linus isn't that fond of ARM
board files, which is where the conflicts are...
One could argue that the board file changes should go through the OMAP
tree, but both the driver and the board files need to be changed at the
same time to keep kernel compiling.
Tomi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
