On Mon, Jun 05, 2017 at 02:57:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> include/uapi/linux/tty.h
>
> between commit:
>
> 8a8dabf2dd68 ("tty: handle the case where we cannot restore a line
> discipline")
>
> from
On Mon, Jun 05, 2017 at 02:57:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> include/uapi/linux/tty.h
>
> between commit:
>
> 8a8dabf2dd68 ("tty: handle the case where we cannot restore a line
> discipline")
>
> from
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/uapi/linux/tty.h
between commit:
8a8dabf2dd68 ("tty: handle the case where we cannot restore a line
discipline")
from the tty tree and commit:
1ab92da32e37 ("staging: speakup: add tty-based comms
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/uapi/linux/tty.h
between commit:
8a8dabf2dd68 ("tty: handle the case where we cannot restore a line
discipline")
from the tty tree and commit:
1ab92da32e37 ("staging: speakup: add tty-based comms
On Mon, Feb 01, 2016 at 02:51:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/dgap/dgap.c
>
> between commits:
>
> 6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
> 2d73b069f816
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/dgap/dgap.c
between commits:
6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
2d73b069f816 ("staging: dgap: Remove redundant write_wait wakeups")
9db276f8f021 ("tty: Use termios
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/dgap/dgap.c
between commits:
6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
2d73b069f816 ("staging: dgap: Remove redundant write_wait wakeups")
9db276f8f021 ("tty: Use termios
On Mon, Feb 01, 2016 at 02:51:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/dgap/dgap.c
>
> between commits:
>
> 6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
> 2d73b069f816
On Thu, Nov 29, 2012 at 03:47:39PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
> drivers/staging/Kconfig between commit 7355ba3445f2 ("staging: fwserial:
> Add
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
drivers/staging/Kconfig between commit 7355ba3445f2 ("staging: fwserial:
Add TTY-over-Firewire serial driver") from the tty tree and commit
e5711071ad94
On Wed, Nov 28, 2012 at 04:14:30PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b ("staging:
> dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp
> driver")
On Wed, Nov 28, 2012 at 04:14:30PM +1100, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b (staging:
dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp
driver) from the
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
drivers/staging/Kconfig between commit 7355ba3445f2 (staging: fwserial:
Add TTY-over-Firewire serial driver) from the tty tree and commit
e5711071ad94
On Thu, Nov 29, 2012 at 03:47:39PM +1100, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
drivers/staging/Kconfig between commit 7355ba3445f2 (staging: fwserial:
Add
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b ("staging:
dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp
driver") from the tty tree and commit 8fdefcb0ab74 ("staging: dgrp:
remove TIOCGSOFTCAR
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b (staging:
dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp
driver) from the tty tree and commit 8fdefcb0ab74 (staging: dgrp:
remove TIOCGSOFTCAR and
On Mon, Sep 17, 2012 at 05:37:06PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
> ("TTY: use tty_port_register_device") from the tty tree and commit
> d04600679ba0
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
("TTY: use tty_port_register_device") from the tty tree and commit
d04600679ba0 ("Staging: ipack/devices/ipoctal: simplify ipoctal_write_tty
()") from the
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
(TTY: use tty_port_register_device) from the tty tree and commit
d04600679ba0 (Staging: ipack/devices/ipoctal: simplify ipoctal_write_tty
()) from the
On Mon, Sep 17, 2012 at 05:37:06PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
(TTY: use tty_port_register_device) from the tty tree and commit
d04600679ba0
Hi Samuel,
On Thu, 13 Sep 2012 08:59:25 +0200 Samuel Iglesias Gonsálvez
wrote:
>
> On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
> >
On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
> ("TTY: use tty_port_register_device") from the tty tree and commit
> 2afb41d9d30d
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
("TTY: use tty_port_register_device") from the tty tree and commit
2afb41d9d30d ("Staging: ipack/devices/ipoctal: Check tty_register_device
return value")
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
(TTY: use tty_port_register_device) from the tty tree and commit
2afb41d9d30d (Staging: ipack/devices/ipoctal: Check tty_register_device
return value) from
On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
(TTY: use tty_port_register_device) from the tty tree and commit
2afb41d9d30d (Staging:
Hi Samuel,
On Thu, 13 Sep 2012 08:59:25 +0200 Samuel Iglesias Gonsálvez
sigles...@igalia.com wrote:
On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/ipack/devices/ipoctal.c between commit
26 matches
Mail list logo
