* linux-next: manual merge of the tty tree with the arm tree
@ 2012-11-06 3:53 Stephen Rothwell
2012-11-06 8:17 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-11-06 3:53 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Shubhrajyoti D, Russell King
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL:
omap: remove setting of EFR SCD bit") from the arm tree and commit
7ba897d77ce2 ("serial: omap: Remove the default setting of special
character") from the tty tree.
I fixed it up (using the version from the arm tree) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tty tree with the arm tree
2012-11-06 3:53 linux-next: manual merge of the tty tree with the arm tree Stephen Rothwell
@ 2012-11-06 8:17 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-11-06 8:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Shubhrajyoti D, Russell King
On Tue, Nov 06, 2012 at 02:53:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL:
> omap: remove setting of EFR SCD bit") from the arm tree and commit
> 7ba897d77ce2 ("serial: omap: Remove the default setting of special
> character") from the tty tree.
>
> I fixed it up (using the version from the arm tree) and can carry the fix
> as necessary (no action is required).
That sounds fine, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-06 8:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-06 3:53 linux-next: manual merge of the tty tree with the arm tree Stephen Rothwell
2012-11-06 8:17 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox