From patchwork Wed Feb 28 23:41:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 208075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:a1a:b0:17b:cd04:e0c6 with SMTP id 26csp260759rwa; Wed, 28 Feb 2024 15:42:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX+Yxco3fBtEc2RelYkidiOUGKS4Ifcoy03Sv5cbFuvH7uD0XcNeVk5zBPXdqqcWyILhfh0IeARfjJojr4vQMpoC+ODXg== X-Google-Smtp-Source: AGHT+IHwlYW8PZIIxh370+OVUjkBwsxivjAMLmi17ErvPKOCc32dMYjVbLFuqeZNFEP/fSNE62X4 X-Received: by 2002:a05:620a:80b:b0:787:dea8:c25c with SMTP id s11-20020a05620a080b00b00787dea8c25cmr493457qks.70.1709163721675; Wed, 28 Feb 2024 15:42:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709163721; cv=pass; d=google.com; s=arc-20160816; b=NJe/rIR7t9wMt+uugxYJvjQ+woqOiuVWMzj9vn9krC2jfECEuXcxPMLBgDb6d09Zqp RBTxAr2r5FVJOZtUYAJlUjZSZlC0DSmRJVRufiZXx4lNXoCzxBNcCNOg/Y1AnY5xJFNc 1Ldr6VTFJRefXjVSJfQPucHKNisGQ2gpwAzQkWam8T+Zr1A2KNX50fOxcyZ1TwyR3fN3 wqVy1NYbfMaCPYTIWBLp5jXWNnc2h+tdJjKhD3m0O013a8xxDkByMJB3c7HL9sVDhNIp vQgSAEEhWo/3BVCeopuFUxW2ss0OpZg+i3i++87JWqrAxkXmG8sqqzEi5tzvXl87dx7u MWvA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=9D6/S4ytWozDqPCtOD7mHgpuDETYo/cvVZTssRszGoo=; fh=EJickB7nH8lkqJRnufavUcxHXJiSdPapbNYwE42x8+A=; b=rxCYzYwmi4vKKOABuGbOe231wtpuXTQWmThq+el1YpzNh7eehhTAK+rtZNjrn0xJhE 4f+6rSw5S5twSE86sY6TJ8GNNIWJ1toEsGHQlD7IPpj5gGR+WUjTEYLCpSzj9dPDaikY 3oZWA7xnzyV0w9bqKobAsL5mqD42sC4bdL8SxY08MrBYfqW498JC3jAhBEVrQqM45MLm YopUBrICR013RfDMcOg4apEAx5QBoNV6SCeITxu7zWlkd3b2QM25pXEuoAKqclJUm2XE 6kcWRJ+CEQqRXG1HOv9Aq07b98vGA+jw3tgGUljngh5Cakfad25KrNO2AM+suRTQz96q tcCQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="ZcPJ/yRM"; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-85855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85855-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id b30-20020a05620a089e00b00787ebbd938csi241427qka.532.2024.02.28.15.42.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 15:42:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="ZcPJ/yRM"; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-85855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85855-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 78F1D1C22A83 for ; Wed, 28 Feb 2024 23:42:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D28D372939; Wed, 28 Feb 2024 23:41:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ZcPJ/yRM" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F28CA13D2E3; Wed, 28 Feb 2024 23:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709163706; cv=none; b=eGIYf10a/r6F0ZBqV6ZhW1A/K6oI8xBh1KleHPUh84IKnTFcFPmgSnJZbZ/f8RMVIIn1MHPg8Dr0aGFZDEwEhEFCK/p/QSeZhxk5BHfW/tJQG+fL/+l5VL2ztO/UrTdKu+sF+OGLNcRUWbjx36/37ozoWz2fOtDJI9Og7+O81AI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709163706; c=relaxed/simple; bh=z61fUCMZnjjhj9QdNocZxM5xyU0sgalhNqu/6eVFFw8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=eJkHvMI9334vk7Y8GRrfbDYwhB+zrgr3prGFcdzWWPsL1SsAo1s7wBNaOT/qwcbcndcb0XptlGwVCHqkjgoKBLWLt8vC2wI4XfjsQfRERUkNVNg1aEtNojvIfES9GFvzxnlZJEpB2G2YQiyT6yDx4XNHe4TKLEQBnejXd4LYoqQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=ZcPJ/yRM; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709163701; bh=9D6/S4ytWozDqPCtOD7mHgpuDETYo/cvVZTssRszGoo=; h=Date:From:To:Cc:Subject:From; b=ZcPJ/yRMb3IPJBTpPr/klnRVqYcdCJmhXFGf9tr3pJEL76SbU0EBAEpJnvtiAlIWw TG2S6LF+Erx3ZV4N8cUDzKZcVTfivIVSRgBB9L1gwlGA4B2iDFJKxFzQEzQEmr1TeM 2W216PT4mnmOSk4oFR+rXb+aZF+LLQDpa7WXIaEjjzUwtRIwDZEzBdj8tal3m5X4MN ZKVEMhkxeevbsnhm/6adEAwSSHHaq3/6rHlWsE7dozTWs+v7argdUuI6bhsQ6bfOCY xS8FqBFhR+tVsH+EYBoJX00AQyUxTDUED57EtMFFmgHOznRk+NmhlOSXoxEJ6otOYF OgqG1XCYyBSTQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TlW8j0WB0z4wcb; Thu, 29 Feb 2024 10:41:41 +1100 (AEDT) Date: Thu, 29 Feb 2024 10:41:40 +1100 From: Stephen Rothwell To: Christian Brauner , Jaegeuk Kim Cc: Chao Yu , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs-brauner tree with the f2fs tree Message-ID: <20240229104140.2927da29@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792188058258703006 X-GMAIL-MSGID: 1792188058258703006 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/f2fs/super.c between commit: 5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup") from the f2fs tree and commit: 512383ae4910 ("f2fs: port block device access to files") from the vfs-brauner 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. diff --cc fs/f2fs/super.c index 09ffdd554f9c,09e82624eff5..000000000000 --- a/fs/f2fs/super.c