On 17/04/14 02:04, Linus Torvalds wrote: > On Wed, Apr 16, 2014 at 2:03 AM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote: >> >> The drivers/video/Kconfig change in this pull request will conflict with the >> fbdev reorder series, which is not yet in your tree. If that's an issue, I can >> resend this without the Kconfig change. > > I was actually hoping/expecting you to just resend the renaming > rebased on top of 3.15-rc1. Or maybe you could do it on top of this. Oh, sorry. I somehow got the impression that you were fine with what I had sent, and you'll just merge it after -rc1. I'll send a rebased version, based on fbdev-fixes-3.15. So pull this one first. Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
