linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20121129154739.241d7a45c8bab79b3aeb9fe6@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 15:47:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Hurley <peter@...leysoftware.com>
Subject: linux-next: manual merge of the staging tree with the tty tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
drivers/staging/Kconfig between commit 7355ba3445f2 ("staging: fwserial:
Add TTY-over-Firewire serial driver") from the tty tree and commit
e5711071ad94 ("staging: fwserial: Add TTY-over-Firewire serial driver")
from the staging tree.

I am not sure why this patch exists in both trees :-(

I fixed it up (they are the same but the trees contain more commits
affecting these files) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped