On Fri, 29 Apr 2011, Linus Walleij wrote:
> > Today's linux-next merge of the trivial tree got a conflict in
> > arch/arm/mach-u300/gpio.c between commit 4a5a6e2804a3 ("mach-u300:
> > rewrite gpio driver, move to drivers/gpio") from the ux500-core tree and
> > commit b0c3af5ef0d7 ("arm: mach-u300/gpio: Fix mem_region resource size
> > miscalculations") from the trivial tree.
> >
> > The former removed the file updated by the latter. These updates should
> > be applied to drivers/gpio/u300-gpio.c, now. Joe, maybe you could update
> > your patch and send it to Linus Walleij.
>
> I rewrote the driver completely so likely it will rather be dropped, but
> please check! I'll be happy to carry any patches.
Seems to me that all the calls to request_mem_region() and
release_mem_region() still need the resource_size() fixup even in the new
driver.
Either I can carry the current patch in my tree and let Linus resolve the
conflict, or I can drop it from my tree and you take the fixes through
your tree. Let me know what you prefer.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
