Date: Wed, 2 Sep 2009 15:36:57 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Subject: linux-next: manual merge of the block tree with the ubifs tree
Message-Id: <20090902153657.dc174bf6.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Wed__2_Sep_2009_15_36_57_+1000_GxrH7TJyvmSkUakQ"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1386
Lines: 37

--Signature=_Wed__2_Sep_2009_15_36_57_+1000_GxrH7TJyvmSkUakQ
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
fs/ubifs/super.c between commit 887ee17117fd23e962332b353d250ac9e090b20f
("UBIFS: remove unneeded call from ubifs_sync_fs") from the ubifs tree
and commit 0184fca792940a9e4058b2c63b3f334326a4c7af ("writeback: move
super_block argument to struct writeback_control") from the block tree.

The former removes the code that the latter changes.  I just used the
version from the ubifs tree.  I can carry this fixup as necessary.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Wed__2_Sep_2009_15_36_57_+1000_GxrH7TJyvmSkUakQ
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqeBHkACgkQjjKRsyhoI8yMuwCgjUwWxWDRLFR/5RR/ricJrVb2
bvoAoLQFKeQ5SJ/4L7IqmIddgMahvXv/
=m78R
-----END PGP SIGNATURE-----

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