From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1F23C5B57D for ; Wed, 3 Jul 2019 03:19:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88DEA2085A for ; Wed, 3 Jul 2019 03:19:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="WGpDCOMh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727197AbfGCDTy (ORCPT ); Tue, 2 Jul 2019 23:19:54 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:45009 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727049AbfGCDTy (ORCPT ); Tue, 2 Jul 2019 23:19:54 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45dmYy57H3z9s3Z; Wed, 3 Jul 2019 13:19:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562123990; bh=aMWKOPSg19BlgZYYRdTAeDuWdyK4008Ci9t23AgoYmc=; h=Date:From:To:Cc:Subject:From; b=WGpDCOMhZ5mCZafXgpr0Q3LbI/LB2ykkEYmFQu39VtYUcGByi5iuGjP3wa+92ncVT byr9vPGP5Kprwo+779+wax1wNMcLwbSwSKjR1tt0i0UMgauJQ0008vKb0WCSpwHvzB R31Kliv5Jq9vepw+Iyah5jNH9sbLM8o2fugowwDcXomGoMksOwBNfnjQq1vseQoyBb a5LRpijyS2xyddbq4UdAYBMzBJL5Xj9LhYQvuno9ulclnLuxsxBxrU1UFYVTCTlKlt Y7KaWz075bmxych4hRQFA948UuaAZyDaosn1XhYVlG+dKC1Wj/+nwn/Dc30cwqVduw gnA8SMgeE/HiA== Date: Wed, 3 Jul 2019 13:19:48 +1000 From: Stephen Rothwell To: Jens Axboe , "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ming Lei , Christoph Hellwig Subject: linux-next: manual merge of the block tree with the xfs tree Message-ID: <20190703131948.37b05189@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/FYqSM1F0geViJaDykvbS9Vo"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/FYqSM1F0geViJaDykvbS9Vo Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the block tree got a conflict in: fs/xfs/xfs_aops.c between commit: a24737359667 ("xfs: simplify xfs_chain_bio") from the xfs tree and commit: 79d08f89bb1b ("block: fix .bi_size overflow") from the block tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc fs/xfs/xfs_aops.c index bb769d9c5250,11f703d4a605..000000000000 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@@ -790,8 -782,8 +790,8 @@@ xfs_add_to_ioend atomic_inc(&iop->write_count); =20 if (!merged) { - if (bio_full(wpc->ioend->io_bio)) + if (bio_full(wpc->ioend->io_bio, len)) - xfs_chain_bio(wpc->ioend, wbc, bdev, sector); + wpc->ioend->io_bio =3D xfs_chain_bio(wpc->ioend->io_bio); bio_add_page(wpc->ioend->io_bio, page, len, poff); } =20 --Sig_/FYqSM1F0geViJaDykvbS9Vo Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0cHtUACgkQAVBC80lX 0GxjbQf7BHHTZllJ6X240rzOrgZ8DA7+yeR4uy9cFKqJlpTY+2ImMN1UnEVUxLpW CppMNCEWVQOMSpLMnkFYt7H+VPbj8Z64Ta6Znv0GxXhYlpgz8AiPx8I1e3Ua3vd+ oEG5GPh4wNTzBzXjxnPD/BtezzGwvvyZPYxoCqlvOj8A6KvyxnpfgqET88JC2POb tvp/BBo8pwVlGhm9vnj5uKPs7YRE4DwC/uWzBZApXLrewdpADXzi3iRAisWclezA Uv7rIA3t4RXMN3onQAlsEIuECyNNqO8TTvNng5iLwM94Rr0VQieakCaonRPAv9eg RnPFmW8oA9eR6zK14SmKlJXKebzVlg== =7nq4 -----END PGP SIGNATURE----- --Sig_/FYqSM1F0geViJaDykvbS9Vo--