linux-kernel - Re: linux-next: manual merge of the mtd 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: <1306482464.2785.154.camel@localhost>
Date:	Fri, 27 May 2011 10:47:44 +0300
From:	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
To:	ext Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Woodhouse <dwmw2@...radead.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Jamie Iles <jamie@...ieiles.com>,
	Marc Zyngier <Marc.Zyngier@....com>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree

On Fri, 2011-05-27 at 14:00 +1000, ext Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the mtd tree got a conflict in
> drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
> MTD: Add integrator-flash feature to physmap") from Linus' tree and
> commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
> from the mtd tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Yes, this looks right, thanks.

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

--
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/