| Message ID | 20190703131948.37b05189@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show
Return-Path: <linux-xfs-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
[172.30.200.125])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8416113BD
for <patchwork-linux-xfs@patchwork.kernel.org>;
Wed, 3 Jul 2019 03:20:14 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43CE928807
for <patchwork-linux-xfs@patchwork.kernel.org>;
Wed, 3 Jul 2019 03:20:14 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id 34BD42896A; Wed, 3 Jul 2019 03:20:14 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
pdx-wl-mail.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C971E28807
for <patchwork-linux-xfs@patchwork.kernel.org>;
Wed, 3 Jul 2019 03:20:12 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1727074AbfGCDTy (ORCPT
<rfc822;patchwork-linux-xfs@patchwork.kernel.org>);
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 <rfc822;linux-xfs@vger.kernel.org>);
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 <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
David Chinner <david@fromorbit.com>, linux-xfs@vger.kernel.org
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>
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-xfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-xfs.vger.kernel.org>
X-Mailing-List: linux-xfs@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
|
| Series |
linux-next: manual merge of the block tree with the xfs tree
|
expand
|
diff --cc fs/xfs/xfs_aops.c index bb769d9c5250,11f703d4a605..000000000000 --- a/fs/xfs/xfs_aops.c
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.