linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Samuel Iglesias Gonsálvez" <siglesias@igalia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jslaby@suse.cz>,
	Jens Taprogge <jens.taprogge@taprogge.org>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree
Date: Thu, 13 Sep 2012 08:59:25 +0200	[thread overview]
Message-ID: <1347519565.4539.204.camel@fourier.local.igalia.com> (raw)
In-Reply-To: <20120913161417.e863926832ccf8a2e1ca1f2a@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]

On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816
> ("TTY: use tty_port_register_device") from the tty tree and commit
> 2afb41d9d30d ("Staging: ipack/devices/ipoctal: Check tty_register_device
> return value") from the staging tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
> 

Thanks Stephen.

I don't see tty_port_register_device in any header file in staging.

Is it defined in tty tree and it is not merged into staging tree?

Best regards,

Sam



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

  reply	other threads:[~2012-09-13  6:58 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-13  6:14 linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell
2012-09-13  6:59 ` Samuel Iglesias Gonsálvez [this message]
2012-09-13  7:36   ` Stephen Rothwell
  -- 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-11-28  5:14 Stephen Rothwell
2012-11-28 16:47 ` Greg KH
2012-09-17  7:37 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
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=1347519565.4539.204.camel@fourier.local.igalia.com \
    --to=siglesias@igalia.com \
    --cc=greg@kroah.com \
    --cc=jens.taprogge@taprogge.org \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).