linux-kernel - linux-next: manual merge of the akpm tree with the staging 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]

Date:	Thu, 10 Jul 2014 16:27:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sachin Kamat <sachin.kamat@...sung.com>
Subject: linux-next: manual merge of the akpm tree with the staging tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
("staging: emxx_udc: Fix build error") from the staging tree and commit
"drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
kstrto()" from the akpm tree.

I fixed it up (I just used the version from the staging tree) and can
carry the fix as necessary (no action is required).

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)