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

Date:	Tue, 13 Jan 2015 16:49:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
	Leonid Iziumtsev <x0153368@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gigi Joseph <gigi.joseph@...il.com>,
	Gustavo Padovan <gustavo.padovan@...labora.co.uk>,
	Amir Ayun <amira@...com>, Pavan Savoy <pavan_savoy@...com>
Subject: linux-next: manual merge of the akpm-current tree with the
 char-misc tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/misc/ti-st/st_core.c between commit 0ec0cf19201d
("drivers:misc:ti-st: protect against bad packets") from the char-misc
tree and commit 55ed078edf3f ("drivers/misc/ti-st/st_core.c: fix NULL
dereference on protocol type check") from the akpm-current tree.

I fixed it up (they were doing the same thing, so I kept the former as
it has a nice comment) 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