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

Hi Tony, On Tue, 2 Apr 2013 16:42:27 + "Luck, Tony" 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 > > d8e904861a2

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

> 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 choos