linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Date:	Wed, 3 Apr 2013 10:07:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Luck, Tony" <tony.luck@...el.com>
Cc:	Al Viro <viro@...IV.linux.org.uk>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Richard Weinberger <richard@....at>
Subject: Re: linux-next: manual merge of the vfs tree with the ia64 tree

Hi Tony,

On Tue, 2 Apr 2013 16:42:27 +0000 "Luck, Tony" <tony.luck@...el.com> wrote:
>
> > 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).
> 
> It looks like you picked the version from the ia64 tree - but it would have
> been better to pick Al's version. He wastes less space on the stack by only
> declaring cpustr[3+4+1] instead of cpustr[32], but more importantly he
> checks the return value from proc_mkdir().

I actually (effectively) dropped Al's tree due to a build error (after
making the "correct" choice).  It will be back in today.

> I'll drop 40c275bd92b8 out of my tree so Al's can go in without a conflict.

OK.

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

Content of type "application/pgp-signature" skipped