From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425Ab0ELANY (ORCPT ); Tue, 11 May 2010 20:13:24 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:45887 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331Ab0ELANW (ORCPT ); Tue, 11 May 2010 20:13:22 -0400 Date: Wed, 12 May 2010 10:13:15 +1000 From: Stephen Rothwell To: Jan Kara Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Joe Perches , Christoph Hellwig , Steve French , Subject: linux-next: manual merge of the ext3 tree with the cifs tree Message-Id: <20100512101315.af5fb6f8.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__12_May_2010_10_13_15_+1000_JYkBVl6sonDl6qnF" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__12_May_2010_10_13_15_+1000_JYkBVl6sonDl6qnF Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jan, Today's linux-next merge of the ext3 tree got a conflict in fs/cifs/cifsfs.c between commit b6b38f704a8193daba520493ebdaf7e819962fc8 ("[CIFS] Neaten cERROR and cFYI macros, reduce text space") from the cifs tree and commit 31bb95a8175db36ed4772008a7e81014765bb782 ("cifs: drop quota operation stubs") from the ext3 tree. The latter removes some of the code that the former modifies. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__12_May_2010_10_13_15_+1000_JYkBVl6sonDl6qnF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvp8psACgkQjjKRsyhoI8w3UgCfSpdLB6ClPekNSMTfOSI077v4 btwAn1hOjQiwzhPzd22YLl2tRmQAGFCF =Ezih -----END PGP SIGNATURE----- --Signature=_Wed__12_May_2010_10_13_15_+1000_JYkBVl6sonDl6qnF--