On Wed, Apr 9, 2014 at 3:48 AM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote:
>
> The patches are based on 3.14-rc4, and cause big conflicts, although the
> conflicts are not complex as such. They are resolved in linux-next, and also in
> my two branches below. The first one contains a resolved merge for your master
> branch, the second one contains rebased patches on top of your master.
Ok, I did the merge, and it wasn't horrid, although it was good that
you had pre-merged and I could double-check because I did miss some
things (that would likely have shown up in my test builds, but maybe
not).
But looking at the reaulting history, I think I will undo the merge
after all, and end up using your rebased branch instead. Simply
because the mixed file movement and other changes during this merge
window just make the end result unnecessarily hard to follow wrt how
the changes happened.
Let me ruminate on this a while. I don't generally like rebasing, but
for something fairly "mindless" like the file rename, it seems a
better option.
Are there other things pending in this area? Because if there are, I
think I'll take you up on your "or we can rebase on top of -rc1" offer
instead.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
