From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the akpm tree with Linus' tree Date: Fri, 27 Jul 2012 13:57:02 +1000 Message-ID: <20120727135702.ad50880aec871d2d747aa2fb@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Fri__27_Jul_2012_13_57_02_+1000_2xTKyEM4keEu3AEQ" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:38704 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752809Ab2G0D5F (ORCPT ); Thu, 26 Jul 2012 23:57:05 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , Chris Mason , Joe Perches --Signature=_Fri__27_Jul_2012_13_57_02_+1000_2xTKyEM4keEu3AEQ Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in fs/btrfs/relocation.c between commit 23291a044c31 ("Btrfs: fix error handling in __add_reloc_root()") from Linus' tree and commit "btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/btrfs/relocation.c index c5dbd91,790f492..0000000 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@@ -1239,11 -1239,10 +1239,11 @@@ static int __must_check __add_reloc_roo node->bytenr, &node->rb_node); spin_unlock(&rc->reloc_root_tree.lock); if (rb_node) { - kfree(node); btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found " "for start=3D%llu while inserting into relocation " - "tree\n"); + "tree\n", node->bytenr); + kfree(node); + return -EEXIST; } =20 list_add_tail(&root->root_list, &rc->reloc_roots); --Signature=_Fri__27_Jul_2012_13_57_02_+1000_2xTKyEM4keEu3AEQ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJQEhGOAAoJEECxmPOUX5FEq24P/A6j44/qyapuUFcAOqU0W6l0 vQM//7hudQiOzSequpl9zfvGquihIdVF8tjx1NB0wznIRG7W0+DAagB+OiqPMqqE te/VsoHdQh8cjQ6+EoKhjGFOrSw4c+1LdXOEY0sBb6l5FNBJo6QL6vgqE88H4CiP lq3XksYBSeziJvr9FQiNPpDvcsFfhd3Un78kLGzIUpqhz9ZvCTorux/O5muq4yPw ErJHyC2fMFFMwanUyL0Eu7Bs9qTOJoxzHvgucjuA0/8rwvS7BGsLWVCEGz06W7S7 p7lPD4l5HR+ag9DTmVFucZsqnRCfl+1lCGmDRCJmmiWwE7diDzutWdgH/su9PY3M eQ82KKgDSIWBZg5BIyBmhT1RZMqRuDBAcqSDtmKfqOf41nJynFW6y64gG/aNjRiT etVDIqZruWDHf/ge1iJ+n2Al6nkzFDF6t5CTbfRG/NQsuxexbX/T+li3xaNp1Ama viom/IS7j4oGjPL//KRki1gM8RLRxcZ90P604N2Je3yZosw/+PCgg1Ov/ppA4uTh HvYims8GTyrluUmjVWw6ALh8N0HEygnOF45cTI/PPzYoNDBQwKFvdWAmuMBNzLz/ f2HWC03NdFIKniIZZLfNFsKW7ZQVjdcqryx5/gZ3MCHRcfoyksur9hWAIyVs3R/n dGgBa/rRakyyC9xzYK5I =Q7XF -----END PGP SIGNATURE----- --Signature=_Fri__27_Jul_2012_13_57_02_+1000_2xTKyEM4keEu3AEQ--