Re: linux-next: manual merge of the vfs tree with the ia64 tree

[Stephen Rothwell]

Hi Tony,

On Tue, 2 Apr 2013 16:42:27 +0000 "Luck, Tony" <tony.luck@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature