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

[Greg Ungerer]

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@xxxxxxxxxxxx
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/