Re: linux-next: manual merge of the char-misc tree with the tty tree

Hi all, On Fri, 29 Jan 2021 15:53:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got conflicts in: > > drivers/tty/n_tracerouter.c > drivers/tty/n_tracesink.c > > between commit: > > 3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to

Re: linux-next: manual merge of the char-misc tree with the tty tree

On Fri, Jan 29, 2021 at 03:53:41PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got conflicts in: > > drivers/tty/n_tracerouter.c > drivers/tty/n_tracesink.c > > between commit: > > 3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function

linux-next: manual merge of the char-misc tree with the tty tree

Hi all, Today's linux-next merge of the char-misc tree got conflicts in: drivers/tty/n_tracerouter.c drivers/tty/n_tracesink.c between commit: 3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer") from the tty tree and commit: 8ba59e9dee31 ("misc:

Re: linux-next: manual merge of the char-misc tree with the tty tree

On Mon, Feb 11, 2013 at 04:37:14PM +1100, 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 commits 2e124b4a390c ("TTY: > switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to >

Re: linux-next: manual merge of the char-misc tree with the tty tree

On Mon, Feb 11, 2013 at 04:37:14PM +1100, 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 commits 2e124b4a390c (TTY: switch tty_flip_buffer_push) and 9fe8074b82ed (TTY: synclink: Convert + to | for

linux-next: manual merge of the char-misc tree with the tty tree

Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY: switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to | for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia:

linux-next: manual merge of the char-misc tree with the tty tree

Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c (TTY: switch tty_flip_buffer_push) and 9fe8074b82ed (TTY: synclink: Convert + to | for bit operations) from the tty tree and commit 3d55399391c8 (pcmcia:

Re: linux-next: manual merge of the char-misc tree with the tty tree

On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch > tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222 >

Re: linux-next: manual merge of the char-misc tree with the tty tree

On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c (TTY: switch tty_flip_buffer_push) from the tty tree and commits 7e5730d7c222

linux-next: manual merge of the char-misc tree with the tty tree

Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222 ("ipack/devices/ipoctal: fix kernel bug when using pppd"), e7e664fd688a

linux-next: manual merge of the char-misc tree with the tty tree

Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c (TTY: switch tty_flip_buffer_push) from the tty tree and commits 7e5730d7c222 (ipack/devices/ipoctal: fix kernel bug when using pppd), e7e664fd688a