linux-kernel - linux-next: manual merge of the staging tree with the trivial 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120629155724.99c0b8d8ad0738fdc7ebca33@canb.auug.org.au>
Date:	Fri, 29 Jun 2012 15:57:24 +1000
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,
	Paul Bolle <pebolle@...cali.nl>, Jiri Kosina <jkosina@...e.cz>,
	H Hartley Sweeten <hartleys@...ionengravers.com>
Subject: linux-next: manual merge of the staging tree with the trivial tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
("treewide: Put a space between #include and FILE") from the trivial tree
and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
macro") from the staging tree.

Just context changes.  I fixed it up and can carry the fix as necessary.

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

Content of type "application/pgp-signature" skipped