From patchwork Mon Jul 1 01:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11024725 Return-Path: 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 C11E5112C for ; Mon, 1 Jul 2019 01:06:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD15128420 for ; Mon, 1 Jul 2019 01:06:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F6E428468; Mon, 1 Jul 2019 01:06:10 +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 ADC4928420 for ; Mon, 1 Jul 2019 01:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbfGABGJ (ORCPT ); Sun, 30 Jun 2019 21:06:09 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:40221 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726040AbfGABGI (ORCPT ); Sun, 30 Jun 2019 21:06:08 -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 45cThX3R3cz9s4V; Mon, 1 Jul 2019 11:06:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561943165; bh=I10qfJ+8ea8LHMvXkLR3Sm2UqUxEsDLKQNkYrxac6Fc=; h=Date:From:To:Cc:Subject:From; b=nUFiFLnhh3vTSqJTjJX5CW+YZVB0u/RWGzWlV9uPx7K5oS7/nOpvkOjhRJGYubVyj RgnvNA5NDnFf2wOCJco2dm+eeJU5oC2wh8xPGC7FILjiQNAcAKGKUT2/4+jioWC434 DeBOj9cC5cYkr7FNllRapjOQ3bbLlV91f74tzVQbqHcyRwO4Y0L+lsQE9T0knJ6aWH hoJ3MjnntoOcMv05cHp5fuWgsuJ8rsF8NWL0PxoSYi4sgHf6TLUvTv66sn5keJ8Onb 6YsYFNoRsgXRRk+nkA55N6onE4kLVM3/xJeU5JGRV/MNtxMLv6Ij8/GKtRM01pPHXZ yPoimnRXALC1g== Date: Mon, 1 Jul 2019 11:06:03 +1000 From: Stephen Rothwell To: "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org, Jaegeuk Kim Cc: Linux Next Mailing List , Linux Kernel Mailing List , Eric Biggers Subject: linux-next: manual merge of the xfs tree with the f2fs tree Message-ID: <20190701110603.5abcbb2c@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the xfs tree got a conflict in: fs/f2fs/file.c between commit: 360985573b55 ("f2fs: separate f2fs i_flags from fs_flags and ext4 i_flags") from the f2fs tree and commits: de2baa49bbae ("vfs: create a generic checking and prep function for FS_IOC_SETFLAGS") 3dd3ba36a8ee ("vfs: create a generic checking function for FS_IOC_FSSETXATTR") from the xfs tree. I fixed it up (I think - 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. diff --cc fs/f2fs/file.c index e7c368db8185,8799468724f9..000000000000 --- a/fs/f2fs/file.c