From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Samuel Iglesias Gonsálvez" <siglesias@igalia•com>
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 17:36:37 +1000 [thread overview]
Message-ID: <20120913173637.dbbe51c2ca99bdb0a00a961b@canb.auug.org.au> (raw)
In-Reply-To: <1347519565.4539.204.camel@fourier.local.igalia.com>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
Hi Samuel,
On Thu, 13 Sep 2012 08:59:25 +0200 Samuel Iglesias Gonsálvez <siglesias@igalia•com> wrote:
>
> On Thu, 2012-09-13 at 16:14 +1000, Stephen Rothwell wrote:
> >
> > 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).
>
> 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?
Yes, that is the case.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-09-13 7:36 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
2012-09-13 7:36 ` Stephen Rothwell [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-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=20120913173637.dbbe51c2ca99bdb0a00a961b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=jens.taprogge@taprogge$(echo .)org \
--cc=jslaby@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=siglesias@igalia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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