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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 CFD23C43A1D for ; Thu, 12 Jul 2018 02:30:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C4EC20BF2 for ; Thu, 12 Jul 2018 02:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C4EC20BF2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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 S2391242AbeGLChY (ORCPT ); Wed, 11 Jul 2018 22:37:24 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:37006 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389647AbeGLChY (ORCPT ); Wed, 11 Jul 2018 22:37:24 -0400 Received: by mail-it0-f68.google.com with SMTP id p17-v6so5007393itc.2 for ; Wed, 11 Jul 2018 19:30:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=NXMP0A544iSuirhGrlCDScUOUOzeKZjBU6WFmZduAt0=; b=hxvCccY+Bdq2k7ffSoY0X1JUjmIEfQFKG6MXDwuDxlDfHvZTxS9Zt0U0YbF8tsNhxu WFvfhrCqFL2ILvlK9bNyS+gQuuLRfAQEKY36UPBJqzAukmEGe84uHFz8pZMYhjOWaqQW GgADAcqxKhWhs92BOy/FTd0gcN9NPocNV50FR3xIS8vdzjbK/NPbSfnyooW/wyi4E7Ml HFzdnGaL9PE4YXw3kLBWdEpNVZmUxOJoN732oRLv6SGJhKs9eu+DpcXCR77dPYt4PzFl BQgFo1OD2QWotJWIAKu7cdB2uztvQzUBPc+dEPwcyA8dR7miJE9F+Q9sCVtavXzJ62M7 mLTg== X-Gm-Message-State: AOUpUlFQP6BAs6w2LIhre24RnZf1XxBdMB0fmdYCaXeJrzctl9J3L1hz +LZxq6UAHgylBhAm5LmVb+dvBVC8jK12RB/I+nrVEg== X-Google-Smtp-Source: AAOMgpd5DUWnjAJM7ENkOJgWxcsquVAlFtqbZ3fcuqqQQbhNBRSqLhRYVsib84VI2l2FP5K8uei3JaAeoGr/4pC8xv8= X-Received: by 2002:a02:8d43:: with SMTP id o3-v6mr175881jal.133.1531362608906; Wed, 11 Jul 2018 19:30:08 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a4f:5882:0:0:0:0:0 with HTTP; Wed, 11 Jul 2018 19:30:07 -0700 (PDT) In-Reply-To: <20180712113724.413e4a3f@canb.auug.org.au> References: <20180712113724.413e4a3f@canb.auug.org.au> From: Andreas Gruenbacher Date: Thu, 12 Jul 2018 04:30:07 +0200 Message-ID: Subject: Re: linux-next: duplicate patches in the gfs2 and xfs trees To: Stephen Rothwell Cc: Steven Whitehouse , Bob Peterson , "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org, Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 12 July 2018 at 03:37, Stephen Rothwell wrote: > Hi all, > > It looks like part of the xfs tree (the iomap-4.19-merge branch) that > was merge into the gfs2 tree has been rebased and the gfs2 tree has not > been updated to cope. The rebase commits are exactly the same patches > (though I didn't check to see if any of the commit messages had changed). 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. I could redo for-next and add an explicit merge commit with one parent instead of the fast-forward merge; would that be preferable? Thanks, Andreas