linux-kernel - linux-next: manual merge of the irqflags tree with the sh tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20100916142420.f2b31afa.sfr@canb.auug.org.au>
Date:	Thu, 16 Sep 2010 14:24:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Howells <dhowells@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the irqflags tree with the sh tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped