From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Mundt <lethal@linux-sh•org>
Subject: linux-next: manual merge of the irqflags tree with the sh tree
Date: Thu, 16 Sep 2010 14:24:20 +1000 [thread overview]
Message-ID: <20100916142420.f2b31afa.sfr@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2010-09-16 4:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100916142420.f2b31afa.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox