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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20120913173637.dbbe51c2ca99bdb0a00a961b@canb.auug.org.au>
Date:	Thu, 13 Sep 2012 17:36:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Iglesias Gonsálvez 
	<siglesias@...lia.com>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Jiri Slaby <jslaby@...e.cz>,
	Jens Taprogge <jens.taprogge@...rogge.org>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree

Hi Samuel,

On Thu, 13 Sep 2012 08:59:25 +0200 Samuel Iglesias Gonsálvez <siglesias@...lia.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped