* linux-next: manual merge of the tty tree with the m68knommu tree
@ 2011-02-10 5:29 Stephen Rothwell
2011-02-10 18:51 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2011-02-10 5:29 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Greg Ungerer, Tejun Heo
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the tty tree with the m68knommu tree
2011-02-10 5:29 linux-next: manual merge of the tty tree with the m68knommu tree Stephen Rothwell
@ 2011-02-10 18:51 ` Greg KH
2011-02-10 21:04 ` Greg Ungerer
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2011-02-10 18:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg Ungerer, Tejun Heo
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the tty tree with the m68knommu tree
2011-02-10 18:51 ` Greg KH
@ 2011-02-10 21:04 ` Greg Ungerer
2011-02-10 21:20 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Greg Ungerer @ 2011-02-10 21:04 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel, Greg Ungerer,
Tejun Heo
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: gerg@snapgear.com
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the tty tree with the m68knommu tree
2011-02-10 21:04 ` Greg Ungerer
@ 2011-02-10 21:20 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2011-02-10 21:20 UTC (permalink / raw)
To: Greg Ungerer
Cc: Stephen Rothwell, linux-next, linux-kernel, Greg Ungerer,
Tejun Heo
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-10 21:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-10 5:29 linux-next: manual merge of the tty tree with the m68knommu tree Stephen Rothwell
2011-02-10 18:51 ` Greg KH
2011-02-10 21:04 ` Greg Ungerer
2011-02-10 21:20 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox