linux-kernel - linux-next: manual merge of the trivial tree with the arm 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100208154840.a58f46ad.sfr@canb.auug.org.au>
Date:	Mon, 8 Feb 2010 15:48:40 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Daniel Mack <daniel@...aq.de>, Ben Dooks <ben-linux@...ff.org>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the trivial tree with the arm tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-s5pc1xx/irq.c between commit
be97162d47b2e067f9d21097650f2f0405dacc9f ("ARM: S5PC1XX: Use common UART
IRQ handling code") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former removes the comment updated by the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped