From mboxrd@z Thu Jan 1 00:00:00 1970 From: Artem Bityutskiy Subject: Re: linux-next: manual merge of the l2-mtd tree with the vfs tree Date: Tue, 13 Mar 2012 16:40:33 +0200 Message-ID: <1331649633.3595.70.camel@sauron.fi.intel.com> References: <20120313141859.302878a8e2246979c288440d@canb.auug.org.au> Reply-To: dedekind1@gmail.com Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-fxWckKyBgNztmx2UICJY" Return-path: Received: from mga03.intel.com ([143.182.124.21]:8965 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380Ab2CMOik (ORCPT ); Tue, 13 Mar 2012 10:38:40 -0400 In-Reply-To: <20120313141859.302878a8e2246979c288440d@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Stefan Roese , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro , Joe Perches --=-fxWckKyBgNztmx2UICJY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-03-13 at 14:18 +1100, Stephen Rothwell wrote: > Hi Artem, >=20 > Today's linux-next merge of the l2-mtd tree got a conflict in > fs/jffs2/fs.c between commit de071e1a7466 ("switch open-coded instances > of d_make_root() to new helper") from the vfs tree and commit > ab9b393d6ee8 ("jffs2: Convert most D1/D2 macros to jffs2_dbg") from the > l2-mtd tree. >=20 > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thanks. Although I do not see the latest l2-mtd.git tree in the master branch of linux-next, I see some old version of it. E.g., the jffs2 changes are not there. --=20 Best Regards, Artem Bityutskiy --=-fxWckKyBgNztmx2UICJY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJPX1xhAAoJECmIfjd9wqK0wxcQAJJTlUMM8orZg6pjFKgIXeFZ 3ikDpLRbCezQNA63erar5eIexrqmgcHlnTDYwwjbMZ3rqMQurnXFXfgtaveAgbXq sSA+kEWeAIDlov0ouTgzfVqGBHH/0qvkbh7+YL38Zm4GbRONULjbSgDutXkbl3Oi TqQ+snV8wx+3Vz/QSyXmAHtbrl9GY6ezs4o0hn9n2D6i7D/0mtVSThtJ4RvDAAI0 x3NiHuz2Nz2E8Xyc4hr1YA1TRvj2ESccOy1MZR0hsYa+CxL4E5Rxi4oZX3eYwqLm Inlz9vJZ7qQFFn9/KKYj+ELNdY9yqOFd9hAUttUiXNazh8IM7aHaIzLk4yJ1lKrR I7H7muJfTNJJTsZdjOkbIP5jUpVugEnJdiCCs7yT93nTlixKgSym+O5wxb/u6XA8 XHGnCO040jz8uAuAT6zfBNx2sllsKyKeHr8i1zBuwkOaDdNOZmdMZVmqitUmALgF J36g805mZLFSbuSLh2xeUyyXzdeyalZ+IW+J4ynagr7NA5JCNJNLN4XNqtXiksLt RtsaPS5uIG1xvXvyqoVTDYYnhJZKgqvc48gkX1n7cRIwwmVhKLzNIs6vMOglv0rd e+VJc/tUdK9YGXG/t/JXzmMPRTUwpN2SF3SOqEZWXRPG0CdinjB7J8y9ghGJ9yHf tZGedkeIAj/Qsoxg5lPm =t+Xn -----END PGP SIGNATURE----- --=-fxWckKyBgNztmx2UICJY--