On 10/26/2011 03:34 PM, Greg KH : > On Wed, Oct 26, 2011 at 03:18:21PM +0200, Linus Torvalds wrote: >> On Wed, Oct 26, 2011 at 1:42 PM, Greg KH <gregkh@xxxxxxx> wrote: >>> >>> The one in 8250_pci.c is trivial to fix, the atmel_serial one isn't as >>> easy, but I'm sure you can figure it out :) If you want me to do the >>> merge for it, I'll be glad to do so, just let me know. >> >> So I figured it out, but please double-check, especially since it >> seems to be some arm-only driver that I can't even compile-test my >> resolution. > > I think it looks correct, but yeah, as I can't build it either, it's > tough to tell. > > Nicolas, can you verify that Linus's merge was done correctly? If not, > can you send a patch? It is commit > efb8d21b2c6db3497655cc6a033ae8a9883e4063 in Linus's tree right now. Yes, I have verified Linus's merge and it is correct. Stephen hit this merge conflict in linux-next yesterday and I sent the fixup as "[PATCH] tty/serial: atmel_serial: fixup merge conflict". Anyway, sorry for the noise it has produced... For the functions and macros that has been highlighted by Domenico in his attempt to compile the atmel_serial driver, they shall come with "device tree" git tree pull. Best regards, -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
