2011-02-10 05:29:22

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the tty tree with the m68knommu tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/68328serial.c between commit
abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
port.tty") from the m68knommu tree and commit
f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
m68k_serial->tqueue_hangup") from the tty tree.

I just used the latter since it removed some of the code modified by the
former.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (537.00 B)
 (No filename) (490.00 B)
 Download all attachments

2011-02-10 18:51:45

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: manual merge of the tty tree with the m68knommu tree

On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/68328serial.c between commit
> abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
> port.tty") from the m68knommu tree and commit
> f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
> m68k_serial->tqueue_hangup") from the tty tree.
>
> I just used the latter since it removed some of the code modified by the
> former.

Sounds fine, thanks.

greg k-h

2011-02-10 21:08:29

by Greg Ungerer

[permalink] [raw]
Subject: Re: linux-next: manual merge of the tty tree with the m68knommu tree

On 11/02/11 04:51, Greg KH wrote:
> On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the tty tree got a conflict in
>> drivers/tty/serial/68328serial.c between commit
>> abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
>> port.tty") from the m68knommu tree and commit
>> f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
>> m68k_serial->tqueue_hangup") from the tty tree.
>>
>> I just used the latter since it removed some of the code modified by the
>> former.
>
> Sounds fine, thanks.

The fix in commit abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu:
fix derefernce of port.tty") are needed to get that file to compile.
So I will be sending that to Linus for 2.6.38 (ie very soon).

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: [email protected]
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com

2011-02-10 21:25:46

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: manual merge of the tty tree with the m68knommu tree

On Fri, Feb 11, 2011 at 07:04:37AM +1000, Greg Ungerer wrote:
> On 11/02/11 04:51, Greg KH wrote:
> >On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote:
> >>Hi Greg,
> >>
> >>Today's linux-next merge of the tty tree got a conflict in
> >>drivers/tty/serial/68328serial.c between commit
> >>abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
> >>port.tty") from the m68knommu tree and commit
> >>f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
> >>m68k_serial->tqueue_hangup") from the tty tree.
> >>
> >>I just used the latter since it removed some of the code modified by the
> >>former.
> >
> >Sounds fine, thanks.
>
> The fix in commit abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu:
> fix derefernce of port.tty") are needed to get that file to compile.
> So I will be sending that to Linus for 2.6.38 (ie very soon).

That's fine with me, thanks for doing that.

greg k-h