Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
sound/core/info.c between commit d1ffe1db6641 ("snd_info_register: switch
to proc_create_data/proc_mkdir_mode") from the vfs tree and commit
"sound: convert snd_info_register() to use proc_create_data()" from the
akpm tree.
It looks like they are trying to do the same thing, so I dropped the akpm
tree version and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpi13z6yJxeP.pgp
Description: PGP signature
