From patchwork Mon Feb 12 23:04:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 200093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp213929dyb; Mon, 12 Feb 2024 15:05:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyNhYQNmxLAktrk6DAQC4JMhmyIp+Gm0dSczGKtxoPkFDR59cdCZCY1sbV51/hK93AvqUv X-Received: by 2002:a17:906:4109:b0:a3c:fcb5:fbb7 with SMTP id j9-20020a170906410900b00a3cfcb5fbb7mr96495ejk.28.1707779123117; Mon, 12 Feb 2024 15:05:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707779123; cv=pass; d=google.com; s=arc-20160816; b=PHBR4iKF4UXfwDKemqvjS+4sjz+jQOWt5RVjff2KRJGF/QwZrC7MQ15d8H32h1tF1X 9l68y6jWFCvyLIpiqiEM+S4ns3Srsc5sW3mcphqAny1vwvpjbK9QsDo+CA9QZ8vbG32L ZzU6O67pCI1x6kgwd0DZLOJOVzgLaOlPjSyLP3E6I/rOpYH8J/sUBtNm9tJHbWbDDzwX DblHQmCbeStbk6fy2YsUSwlLh95aHjo93dQHvMJTQZvUuGjuxn1vVh5tx0i1fG86FdUx nViDMrHmezw9i38jWhvEf3kgX2gKObPX5M9qStWta1nW3VACh6S2pkW8WLiLp/6LMSsi p7GQ== 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=Eq4c4CTqsb904CNVrto0W+3RppC+ap2MIeph085cVZI=; fh=cLYFbVidy1hxijqtgiOaTIo6q7TJ0MnO47M9V4wojRA=; b=yGUDNC404BPcL/gx+sP8LXcd8iEoijF8KHFYLJkhhPyft6UI+yePWj8eKcEhVN6ntv jXo7W/pNZx65UVq6gYd0ypYU06Kw8NIT/AK9i1rrq9WyXAO26rj5L04I2J+XKsODoFHy L0npeZa7IKDKnz2xfxOvOWFguDm6DyDErSh+oOM82gkrkNIPck652t3WnpYZ/CTOXuML RSW0fRWB1IIYTOC49H2HccE3At0DO/Fsi7UZw7TeTJezG12TMtl6x6FlJqjxPJY82ET3 yfKOb2Ra+kEbpsmrFw1KyLRpsVJmbGVAZtaV6Fwbd7y5dKnmYD/xCPc9iJoV2RKCLQGQ IWlg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="thg/0U7R"; 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-62518-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62518-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCU3Pzmd/tnWwDYHjWVYmBglOTWDJAVpckeQix2hdb6CcFT8+yy51oAazLX2QotP93OwIU0Jc8bB6kZfNboC7b8lr8h5zA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id gz13-20020a170906f2cd00b00a3c89d1d490si592870ejb.214.2024.02.12.15.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 15:05:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-62518-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="thg/0U7R"; 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-62518-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62518-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 am.mirrors.kernel.org (Postfix) with ESMTPS id B8C651F236EE for ; Mon, 12 Feb 2024 23:05:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 620754F608; Mon, 12 Feb 2024 23:05:11 +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="thg/0U7R" 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 7F2A34F885; Mon, 12 Feb 2024 23:05:04 +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=1707779107; cv=none; b=O/lvKzpnI56Pc7A/Ls9REU45tJ7TTYGxYlsE05W+SuwvJqCJwtFKMeD5iJsN6UF4T5YuEBBiyHUd5+e0Ez3fTabcZbjO4H/RKloScrCq1NlaQMDWkDzX+OmhE9qXKFoZsDWP9I8gXs7qbemANJLuucrT3B9pVlpifxTYzyyOnQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707779107; c=relaxed/simple; bh=ktd9h9qlvN0UnUZCeYB3SASIwovngcWwR2R8apaMxQ0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=HDUVDe4s3C4wYNq8eA7Vvi+oEbBgJi/6WG6nwJ09ByJVUFJkzlYs1EUkZxkD0o6R+NtMonyB5djFq6mTb5A36Maa9XSfrcBORkOXkA6/FGkAiNkRyERFtkXChFLJodyyvF9hiDzGXulY+rw2ki3T3DOsd+GBgu+H9fJnWF2Uiew= 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=thg/0U7R; 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=1707779097; bh=Eq4c4CTqsb904CNVrto0W+3RppC+ap2MIeph085cVZI=; h=Date:From:To:Cc:Subject:From; b=thg/0U7RaOeHsJnGHVczSuCbmZ7WGVRJVHbL3ftNvsahjXyn6W6UbGHHEuIaJ1LLG MCqyzJCJlj2VWgcLCTvHn/PMu2sHKociAgWLp9H6Lb8el8vxap3xkZAMQpKW+CrA6N 6fgpj6CwwwDSaev0AG3DB4ojzcbm+1DRxLAj7hHEKimJDiltYlPFkz92XEmc68z5rr 981wdJHJbGPkANSOrWOuqojGyQwjPM49ObRidxJOrl2xLDRBS1u7EJ9GXcsDDGDRr5 N0QErv0yiGd4FFJUX768xruEdc/X9v2QrP7ikqpVms91BW+Naw+YQC/m99IGn6n36E mjQMsJGB1aZhw== 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 4TYg5j22y7z4wcM; Tue, 13 Feb 2024 10:04:57 +1100 (AEDT) Date: Tue, 13 Feb 2024 10:04:55 +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: <20240213100455.07e181c8@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: 1790736201868568817 X-GMAIL-MSGID: 1790736201868568817 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/bcachefs/super-io.c between commit: 7dcfb87af973 ("bcachefs: fix kmemleak in __bch2_read_super error handling path") 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 36988add581f,ce8cf2d91f84..000000000000 --- a/fs/bcachefs/super-io.c