All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bill Pemberton <wfp5p@virginia.edu>,
	Kumar Amit Mehta <gmate.amit@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree
Date: Wed, 28 Nov 2012 08:47:26 -0800	[thread overview]
Message-ID: <20121128164726.GA15624@kroah.com> (raw)
In-Reply-To: <20121128161430.e6719a4c3f55f12074b6cfc4@canb.auug.org.au>

On Wed, Nov 28, 2012 at 04:14:30PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b ("staging:
> dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp
> driver") from the tty tree and commit 8fdefcb0ab74 ("staging: dgrp:
> remove TIOCGSOFTCAR and TIOCSSOFTCAR handling") from the staging tree.
> 
> I fixed it up (using the staging tree version - since it is a superset of
> the tty tree version) and can carry the fix as necessary (no action is
> required).

That is correct, thanks for doing this.

greg k-h

  reply	other threads:[~2012-11-28 16:47 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-28  5:14 linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell
2012-11-28 16:47 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-04  6:33 Stephen Rothwell
2022-10-04  8:26 ` Greg KH
2017-06-05  4:57 Stephen Rothwell
2017-06-05  6:50 ` Greg KH
2016-02-01  3:51 Stephen Rothwell
2016-02-01  4:01 ` Greg KH
2012-11-29  4:47 Stephen Rothwell
2012-11-29  5:17 ` Greg KH
2012-09-17  7:37 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-13  6:14 Stephen Rothwell
2012-09-13  6:59 ` Samuel Iglesias Gonsálvez
2012-09-13  7:36   ` Stephen Rothwell
2012-05-07  5:58 Stephen Rothwell
2012-05-07 14:48 ` Greg KH

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=20121128164726.GA15624@kroah.com \
    --to=greg@kroah.com \
    --cc=gmate.amit@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=wfp5p@virginia.edu \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.