On Thu, 11 Dec 2008 17:26:45 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/serial/8250.c between commit
> 507ce132910803e8fd1116467e99f59da3d526f0 ("iop13xx: workaround errata
> that causes uart interrupts to be missed") from the async_tx tree and
> commit 63c4074301f79f1620d6c880973d6ef1cc770990
> ("tty-serial-8250-regops") from the ttydev tree.
>
> I have reverted the async_tx commit for today. Please try to figure out
> what should happen here.
Dan - can you feed the uart 8250 patches through the ttydev tree or are
there dependancies on other parts of async_tx ?
Alan
--
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
