From: Greg KH <greg@kroah.com>
To: Greg Ungerer <gerg@snapgear.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Greg Ungerer <gerg@uclinux.org>, Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the m68knommu tree
Date: Thu, 10 Feb 2011 13:20:30 -0800 [thread overview]
Message-ID: <20110210212030.GA19226@kroah.com> (raw)
In-Reply-To: <4D5452E5.9080304@snapgear.com>
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
prev parent reply other threads:[~2011-02-10 21:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110210212030.GA19226@kroah.com \
--to=greg@kroah.com \
--cc=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).