* linux-next: manual merge of the irqflags tree with the sh tree
@ 2010-09-16 4:24 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-09-16 4:24 UTC (permalink / raw)
To: David Howells; +Cc: linux-next, linux-kernel, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-16 4:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-16 4:24 linux-next: manual merge of the irqflags tree with the sh tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox