* linux-next: manual merge of the char-misc tree with the tree
@ 2012-09-27 5:31 Stephen Rothwell
2012-09-27 14:02 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-09-27 5:31 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann
Cc: linux-next, linux-kernel, Alexey Khoroshilov, Huang Shijie
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
drivers/char/pcmcia/synclink_cs.c between commit f21ec3d2d46e ("serial:
add a new helper function") from the tty tree and commit 221b7b5796b5
("pcmcia: synclink_cs: fix potential tty NULL dereference") from the
char-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/char/pcmcia/synclink_cs.c
index 3f57d5de,a6b8dde..0000000
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -1050,7 -1058,7 +1058,7 @@@ static void cts_change(MGSLPC_INFO *inf
wake_up_interruptible(&info->status_event_wait_q);
wake_up_interruptible(&info->event_wait_q);
- if (tty_port_cts_enabled(&info->port)) {
- if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
++ if (tty && tty_port_cts_enabled(&info->port)) {
if (tty->hw_stopped) {
if (info->serial_signals & SerialSignal_CTS) {
if (debug_level >= DEBUG_LEVEL_ISR)
[-- 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 char-misc tree with the tree
2012-09-27 5:31 linux-next: manual merge of the char-misc tree with the tree Stephen Rothwell
@ 2012-09-27 14:02 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-09-27 14:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next, linux-kernel, Alexey Khoroshilov,
Huang Shijie
On Thu, Sep 27, 2012 at 03:31:19PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/pcmcia/synclink_cs.c between commit f21ec3d2d46e ("serial:
> add a new helper function") from the tty tree and commit 221b7b5796b5
> ("pcmcia: synclink_cs: fix potential tty NULL dereference") from the
> char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-27 14:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 5:31 linux-next: manual merge of the char-misc tree with the tree Stephen Rothwell
2012-09-27 14:02 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox