On Thu, Sep 17, 2020 at 04:09:46PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/8250/8250_pci.c
>
> between commit:
>
> 3c5a87be170a ("serial: 8250_pci: Add Realtek 816a and 816b")
>
> from the tty.current t
On Wed, Aug 02, 2017 at 02:26:28PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/8250/8250_core.c
>
> between commit:
>
> 9527b82ae3af ("Revert "serial: Delete dead code for CIR serial ports"")
>
> from the
On Wed, Aug 02, 2017 at 02:26:28PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/8250/8250_core.c
>
> between commit:
>
> 9527b82ae3af ("Revert "serial: Delete dead code for CIR serial ports"")
>
> from the
On Thu, Mar 30, 2017 at 5:46 AM, Michael Neuling wrote:
>> > wrote:
>> > > Hi Greg,
>> > >
>> > > Today's linux-next merge of the tty tree got a conflict in:
>> > >
>> > > drivers/tty/tty_ldisc.c
>> > >
>> > > between commit:
>> > >
>> > > 5362544bebe8 ("tty: don't panic on OOM in tty_set_ldis
On Mon, 2017-03-20 at 10:26 +0100, Dmitry Vyukov wrote:
> On Mon, Mar 20, 2017 at 10:21 AM, Dmitry Vyukov wrote:
> > On Mon, Mar 20, 2017 at 3:28 AM, Stephen Rothwell
> > wrote:
> > > Hi Greg,
> > >
> > > Today's linux-next merge of the tty tree got a conflict in:
> > >
> > > drivers/tty/tty_
On Mon, Mar 20, 2017 at 10:26:43AM +0100, Dmitry Vyukov wrote:
> On Mon, Mar 20, 2017 at 10:21 AM, Dmitry Vyukov wrote:
> > On Mon, Mar 20, 2017 at 3:28 AM, Stephen Rothwell
> > wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the tty tree got a conflict in:
> >>
> >> drivers/tty/tty
On Mon, Mar 20, 2017 at 10:21 AM, Dmitry Vyukov wrote:
> On Mon, Mar 20, 2017 at 3:28 AM, Stephen Rothwell
> wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>> drivers/tty/tty_ldisc.c
>>
>> between commit:
>>
>> 5362544bebe8 ("tty: don't panic on OOM i
On Mon, Mar 20, 2017 at 3:28 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/tty_ldisc.c
>
> between commit:
>
> 5362544bebe8 ("tty: don't panic on OOM in tty_set_ldisc()")
>
> from the tty.current tree and commit:
>
> 71
On Thu, Mar 31, 2016 at 05:23:27PM -0700, Peter Hurley wrote:
> On Sun, Feb 7, 2016 at 6:21 PM, Greg KH wrote:
> > On Mon, Feb 08, 2016 at 01:16:29PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the tty tree got a conflict in:
> >>
> >> drivers/tty/tty_io.c
On Sun, Feb 7, 2016 at 6:21 PM, Greg KH wrote:
> On Mon, Feb 08, 2016 at 01:16:29PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>> drivers/tty/tty_io.c
>>
>> between commit:
>>
>> e9036d066236 ("tty: Drop krefs for interrupted
On 02/07/2016 06:21 PM, Greg KH wrote:
> Peter, is the merge above correct?
Yes, thanks.
On Mon, Feb 08, 2016 at 01:16:29PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/tty_io.c
>
> between commit:
>
> e9036d066236 ("tty: Drop krefs for interrupted tty lock")
>
> from the tty.current tree and commit:
On Mon, May 25, 2015 at 05:28:21PM +0100, Greg KH wrote:
> On Mon, May 25, 2015 at 06:19:38PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the tty tree got a conflict in
> > drivers/tty/serial/amba-pl011.c between commit 43dd1f9a5b05
> > ("serial/amba-pl011: Unco
On Mon, May 25, 2015 at 06:19:38PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/amba-pl011.c between commit 43dd1f9a5b05
> ("serial/amba-pl011: Unconditionally poll for FIFO space before each TX
> char") from the tty.
On Wed, Nov 26, 2014 at 06:12:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/of_serial.c between commit a5e9ab291c60 ("Revert
> "serial: of-serial: add PM suspend/resume support"") from the
> tty.current tree and c
On Mon, Nov 10, 2014 at 03:49:58PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250/8250_mtk.c between commit cd92208f6996 ("tty:
> serial: 8250_mtk: Fix quot calculation") from the tty.current tree and
> commit 2a76
On Thu, Jan 17, 2013 at 01:07:38PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250/8250_dw.c between commit 68e56cb3a068 ("tty:
> 8250_dw: Fix inverted arguments to serial_out in IRQ handler") from the
> tty.current
17 matches
Mail list logo
