linux-kernel - linux-next: manual merge of the vfs tree with the ia64 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: <20130402112017.8c5e288cbbd31f93788df9d5@canb.auug.org.au>
Date:	Tue, 2 Apr 2013 11:20:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Weinberger <richard@....at>,
	"Luck, Tony" <tony.luck@...el.com>
Subject: linux-next: manual merge of the vfs tree with the ia64 tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
arch/ia64/kernel/palinfo.c between commit 40c275bd92b8 ("[IA64] Fix stack
overflow in create_palinfo_proc_entries") from the ia64 tree and commit
d8e904861a28 ("palinfo fixes") from the vfs tree.

I fixed it up (arbitrarily choosing the vfs tree version) 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