Hi David,
Today's linux-next merge of the irqflags tree got a conflict in
arch/sh/include/asm/syscalls_32.h between commit
b9afa3e015273a52718e0a7efe198a0df76be880 ("Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6") from
the sh tree and commit 88c215b32d8af27367dd105f1cf90fa8164b4d3b ("SH: Add
missing consts to sys_execve() declaration") from the irqflags tree.
Same change, but with different white space. I used the version from the
sh tree.
So, David, you could just drop this patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgptvqNqcmihT.pgp
Description: PGP signature
