linux-kernel - linux-next: manual merge of the target-updates tree with Linus' 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>] [day] [month] [year] [list]

Message-Id: <20131108170113.7e9a88ecc8c409815a2548fa@canb.auug.org.au>
Date:	Fri, 8 Nov 2013 17:01:13 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matias Bjorling <m@...rling.me>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the target-updates tree with Linus'
 tree

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
lib/percpu-refcount.c between commit 5e9dd373dea4 ("percpu_refcount:
export symbols") from Linus' tree and commit c9e8d128fe31
("percpu-refcount: Add EXPORT_SYMBOL to use percpu_ref from modules")
from the target-updates tree.

I fixed it up (the version from Linus' tree used EXPORT_SYMBOL_GPL, so I
used that) 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