[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20111025120257.GA12558@kroah.com>
Date: Tue, 25 Oct 2011 14:02:57 +0200
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Tomoya MORINAGA <tomoya-linux@....okisemi.com>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
On Tue, Oct 25, 2011 at 07:12:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250_pci.c between commit dacacc3e794c
> ("serial/8250_pci: delete duplicate data definition") from Linus' tree
> and commit 64d91cfaade2 ("8250_pci: Fix kernel panic when pch_uart is
> disabled") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, the fix is correct.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists