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@xxxxxxxxxxxxxxxx
Attachment:
pgp7lmYxH4EDz.pgp
Description: PGP signature
