linux-kernel - RE: linux-next: manual merge of the ia64 tree with Linus' 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-prev] [day] [month] [year] [list]

Message-ID: <3908561D78D1C84285E8C5FCA982C28F1C95C631@ORSMSX108.amr.corp.intel.com>
Date:	Tue, 27 Nov 2012 00:44:33 +0000
From:	"Luck, Tony" <tony.luck@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Colin Ian King <colin.king@...onical.com>,
	Anton Vorontsov <anton.vorontsov@...aro.org>,
	Seiji Aguchi <seiji.aguchi@....com>
Subject: RE: linux-next: manual merge of the ia64 tree with Linus' tree

> I fixed it up (see below) and can carry the fix as necessary.

I rebased the series onto 3.7-rc7 (using the same merge fix that you did) ... so you shouldn't see the merge error next time.

-Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/