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=-2.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, T_DKIMWL_WL_HIGH,UNPARSEABLE_RELAY,USER_AGENT_MUTT autolearn=ham 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 7FCFBC43A1D for ; Thu, 12 Jul 2018 05:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C384208E3 for ; Thu, 12 Jul 2018 05:53:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="M2gWB7mk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C384208E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727077AbeGLGBm (ORCPT ); Thu, 12 Jul 2018 02:01:42 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:42962 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726722AbeGLGBm (ORCPT ); Thu, 12 Jul 2018 02:01:42 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6C5iosV072379; Thu, 12 Jul 2018 05:53:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=0YxQfSgU7DXJ7/TLBxOQPI4ndyBPKZiA7yjSxUQYKk8=; b=M2gWB7mkFrcCIOxclnQeT7uN7BZgf20ntrd6rQWJwblVTbrGl2ik0iWDLNEz1FKBobx3 QQdptJPzJcY8XYdJEzCUmgCd54E9bsmuLAsnUiXdyxoZqklxR4DnqMGew4giB+Fyj3Pi HA/367onREpzBpzAfolHrtETkUo+BxR8bwNbci2nomM9TdyFOTapZX71Kl4lnk7abqMq tqNBQwam/Oo3DP2uSgpnAo+W1pJpJCAT6J5EZXzAkPDm5GNrDKMG331fIOG6ybB/9bdm wEvdacjIk63dZ0JMiMx4eFCfzWuYNYD5W6FjfdgYAdei/5gBJdZyt2FaRLv/hkjJQs8o fA== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2k2p7vj3hx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Jul 2018 05:53:23 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w6C5rMUw013316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Jul 2018 05:53:23 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w6C5rMv1019107; Thu, 12 Jul 2018 05:53:22 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 11 Jul 2018 22:53:22 -0700 Date: Wed, 11 Jul 2018 22:53:20 -0700 From: "Darrick J. Wong" To: Andreas Gruenbacher Cc: Stephen Rothwell , Steven Whitehouse , Bob Peterson , David Chinner , linux-xfs@vger.kernel.org, Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Subject: Re: linux-next: duplicate patches in the gfs2 and xfs trees Message-ID: <20180712055320.GL32415@magnolia> References: <20180712113724.413e4a3f@canb.auug.org.au> <20180712144102.746cb560@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8951 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=9 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807120060 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 12, 2018 at 07:16:18AM +0200, Andreas Gruenbacher wrote: > Hi Stephen, > > On 12 July 2018 at 06:41, Stephen Rothwell wrote: > > Hi Andreas, > > > > On Thu, 12 Jul 2018 04:30:07 +0200 Andreas Gruenbacher wrote: > >> > >> this is what I'm seeing (git log --pretty=oneline --abbrev-commit > >> --graph ^origin/master gfs2/for-next): > >> > >> * f79caf101801 (gfs2/for-next) gfs2: use iomap_readpage for blocksize > >> == PAGE_SIZE > >> * af58827ee500 gfs2: Use iomap for stuffed direct I/O reads > >> * c38e838abe42 Merge branch 'iomap-4.19-merge' into linux-gfs2/for-next > >> |\ > >> | * 806a1477b10a (xfs/iomap-4.19-merge) iomap: add inline data support > >> to iomap_readpage_actor > >> | * ec181f6782d8 iomap: support direct I/O to inline data > >> | * 09230435dffd iomap: refactor iomap_dio_actor > >> | * c03cea42149d iomap: add initial support for writes without buffer heads > >> | * 72b4daa24129 iomap: add an iomap-based readpage and readpages implementation > >> * | 9ab5aa4f4e10 gfs2: fallocate_chunk: Always initialize struct iomap > >> * | 2e2834ef1797 GFS2: Fix recovery issues for spectators > >> * | 5db0147b887e Merge branch 'iomap-write' into linux-gfs2/for-next > >> |\ \ > >> | * | 025d0e7f73c6 (gfs2/iomap-write) gfs2: Remove gfs2_write_{begin,end} > >> | * | 967bcc91b044 gfs2: iomap direct I/O support > >> | * | bcfe94139a45 gfs2: gfs2_extent_length cleanup > >> | * | 64bc06bb32ee gfs2: iomap buffered write support > >> | * | d505a96a3b16 gfs2: Further iomap cleanups > >> | |/ > >> | * e184fde6f3f5 iomap: add private pointer to struct iomap > >> | * 63899c6f8851 iomap: add a page_done callback > >> | * 19e0c58f6552 iomap: generic inline data handling > >> | * ebf00be37de3 iomap: complete partial direct I/O writes synchronously > >> | * 3d7b6b21f6c5 iomap: mark newly allocated buffer heads as new > >> | * a6d639da63ae fs: factor out a __generic_write_end helper > >> * 3beacef8093b fs: gfs2: Adding new return type vm_fault_t > >> * d80ff78468e4 gfs2: using posix_acl_xattr_size instead of posix_acl_to_xattr > >> * e904f3d486f9 gfs2: Don't reject a supposedly full bitmap if we have > >> blocks reserved > >> * d1475c07f7ce GFS2: rgrp free blocks used incorrectly > >> * b7eba890a228 gfs2: Eliminate redundant ip->i_rgd > >> * 03f8c41c73da gfs2: Stop messing with ip->i_rgd in the rlist code > >> * ee9c7f9ae3d4 gfs2: call ktime_get_coarse_real_ts64() directly > >> * 00251a16d7f9 gfs2: Minor clarification to __gfs2_punch_hole > >> * 9e1a9ecd13b9 gfs2: Don't withdraw under a spin lock > >> * f85c10e24ab9 gfs2: eliminate rs_inum and reduce the size of gfs2 inodes > >> > >> Commit e184fde6f3f5 "iomap: add private pointer to struct iomap" is on > >> xfs/iomap-4.19-merge. That was my initial merge from > >> xfs/iomap-4.19-merge, but it was a fast-forward so there is no merge > >> commit. I've then merged our iomap-write branch into for-next, with > >> two additional commits on top. Then comes the rest of > >> xfs/iomap-4.19-merge (that branch has moved ahead in the meantime), > >> again with two more commits on top. > >> > >> There are no rebased commits, you're looking at the exact same commits. > > > > The problem is that commits > > > > a6d639da63ae fs: factor out a __generic_write_end helper > > > > to > > > > 806a1477b10a (xfs/iomap-4.19-merge) iomap: add inline data support > > > > have been rebased in the xfs tree from a base of v4.18-rc1 to > > v4.18-rc4, so that those patches now appear twice in linux-next where I > > have merged the gfs2 tree and the xfs tree. > > Ah, I see now. It's xfs/for-next that contains those rebased commits > from xfs/iomap-4.19-merge. > > > This has caused a few > > conflicts today as there are more changes to the same files affected by > > those commits in the xfs tree. to iomap_readpage_actor > > > > What should have happened is that those commits should not have been > > rebased, so either the xfs tree needs rebuilding to use the old > > commits, or your tree needs to be rebuilt using the new commits from > > the xfs tree. This is why we do not like the rebasing of published > > trees (especially when a subset of the tree is shared with other > > developers). > > > > Also, if you are going to merge (part of) another tree you need to make > > sure that the other maintainer will not do a rebase of it (I assume > > that this was probably talked about). > > Indeed, the idea of setting up xfs/iomap-4.19-merge was to have a > common base that xfs/for-next and gfs2/for-next could both merge from. > Darrick, could you please fix xfs/for-next? Ok, done, I think. Sorry for the mess, I hadn't ever done 'shared development branch merging into other tree' and clearly didn't get it right. :/ --D > Thanks a lot, > Andreas > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html