From patchwork Wed Feb 14 23:05:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 201174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp37514dyb; Wed, 14 Feb 2024 15:06:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVqUocPDJ11/YIsDF+TXNHhhwpcA/LMFFzDW0shNo6BFQ+a1XRxtr3uXZok/zHzqVfEHfaBg64OrnXoyIulClEqDAXfeg== X-Google-Smtp-Source: AGHT+IFhBe3AmqiDDU81D0amqDcgxfwtpR0h/juDqjFYsBJYQ/dRlXQXbtAo//GikF6xBuA77H3x X-Received: by 2002:a05:6a21:3181:b0:19e:3cbf:60a8 with SMTP id za1-20020a056a21318100b0019e3cbf60a8mr207847pzb.39.1707951976790; Wed, 14 Feb 2024 15:06:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707951976; cv=pass; d=google.com; s=arc-20160816; b=C0iHKV1EcD4MHDROzjVsP1RqUrMi+Vgn3G7rwFV1Z8IRMLrddZzcIohE4YY8D8ohQ3 C6nxIqIrQzP7FKfM5UzQYRmSUCuAdCE01I1LIyqGIETL1owwUq0Pa1rcTJ2os1YSO8MK DaMh1W7s/sfBbCpUKy8cv1lrVi0Cywk+nrSLTeredS3UM1yqrVVpU04Nq8Ii/efAi3Jp +27/Ml8rfwor1fcn9vlbXqbJvmZ7zrP0372dJFdcvRPsMKKxaE2SAgc+lSyX7TPpiIoA SLY05MuwZPYJi/jo7JCuvs7RPYw/6pno/HFYUo2ePetTGxwWAfRdwp3J3PZLSAXEFn/D Rnbg== 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=dlodDWkbvAKyraT6eqM71p8m7BA3X3M7k1OAFsQJ/zo=; fh=4eubilbagmA0/d4yTA8Zmc0mszHBvkj0zDA1c7ft3dc=; b=EDFvjSOfeF+yY8Uw6MBP+6iYKLAJluUGh59ndoWvA9oyckt+CewsesrICNFsT7GIZy OEabvOIKI9N8MsZ8ig15QgsfmySC7RMpmfvXAqetGQvV9tYxjR8lkXObojf2aWA+tSWp oGP6aDYX4yo+ImU7gvClZ/0rbEDAx9Yc5LNOFB0kEGlF9kSlMtnXP8fyHfjTH/kNP8Q6 FWvrW18IIov+BjEZ4+z0F0NWpE26Okw8TNA8f8HYFqEkV1G/2MdxUmT/9njLIQXMQUwR UuzeF4/rUxBcdYmWnWnd2Iy+SLBuWUSrhKEAZJ3jPvInm50mU8jw6rkjHbfYcZZNOd3D be5A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=vET0gtzY; 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-66100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66100-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id r3-20020a17090ad40300b002970d0ed299si38609pju.182.2024.02.14.15.06.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 15:06:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=vET0gtzY; 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-66100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66100-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 6D5E428AF36 for ; Wed, 14 Feb 2024 23:05:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 997201419B5; Wed, 14 Feb 2024 23:05:27 +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="vET0gtzY" 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 8075155E48; Wed, 14 Feb 2024 23:05:20 +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=1707951925; cv=none; b=rPeoBgSUG0eO8l9T6+/zTh4ECPw4Ichz9+sQuKU6bdsyt+PrYUjQbam3G6o1IzyloBlfi9i9OcilrJrpVYkAbaXifhm2dBg++563Zr/79yBLhbnh/0D+LUtYG+f7TlFtGZn0XEwqwyXnQ0kmmL3I182tpWUD66erNzP5Hm0gXSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707951925; c=relaxed/simple; bh=YUeR7xv81BRSzDaMPhaiGhJnCyXHfP6ExNWePpAnJfo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=kq66i1J4/iies9NLbsxWmCS7/WDhRKFKQq8jG/nOL7nYBJqNVRYrqnmGc/mn43MCBD7gmEKAS3n76moumKEXfEaKD7n9pzQmpMUG7085t+546q5CnC8nQ2uQ4jVfyk9bZbEaXnDcAmoAzmroSHQpHTHWLnxONE0rLjI9Mu0wZeo= 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=vET0gtzY; 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=1707951919; bh=dlodDWkbvAKyraT6eqM71p8m7BA3X3M7k1OAFsQJ/zo=; h=Date:From:To:Cc:Subject:From; b=vET0gtzYYZV2QwYRNX0+XZfl7xxe528G5yimoPNArmRkT7mQoiGS4VDrrQGU93ykg zIoBBrtu1c+cv0QRxcnnfaxMPlYZBMVnujiS0oUTZf58JlMO6DAtS6/VCh5qB6RMbX QdYm442UOn8fDoGlLjsxiYK9w+3vpEfkwtPdWmv0mWw8KkyziWjZ93kD0ixaFHeb7m xRZmBPTeg9HGKVrbywtwzkvtyAD5bmRWqN0Mr2ODgEHVByC5PR/lGPOK1nZWzS4Q49 8MawdU27tMOdMya1Zv1TZnRaaDwFlE31518JVz1jGy8iAhX/XZltEaVJAT5wBzbNOu 5cXZ1Z2zOtWIQ== 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 4TZv1B6vljz4x0m; Thu, 15 Feb 2024 10:05:18 +1100 (AEDT) Date: Thu, 15 Feb 2024 10:05:17 +1100 From: Stephen Rothwell To: Christian Brauner , Kent Overstreet Cc: Linux Kernel Mailing List , Linux Next Mailing List , Su Yue Subject: linux-next: manual merge of the vfs-brauner tree with the bcachefs tree Message-ID: <20240215100517.027fd255@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: 1790917452086629472 X-GMAIL-MSGID: 1790917452086629472 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/bcachefs/super-io.c between commits: 7dcfb87af973 ("bcachefs: fix kmemleak in __bch2_read_super error handling path") 4a3cf4df64fd ("bcachefs: bch2_print_opts()") from the bcachefs tree and commit: 1df39a40e912 ("bcachefs: port block device access to file") 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/bcachefs/super-io.c index a3a9e85ab03c,ce8cf2d91f84..000000000000 --- a/fs/bcachefs/super-io.c