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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A98F1C7EE26 for ; Wed, 24 May 2023 00:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238938AbjEXAGk (ORCPT ); Tue, 23 May 2023 20:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238937AbjEXAGi (ORCPT ); Tue, 23 May 2023 20:06:38 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EF35135; Tue, 23 May 2023 17:06:36 -0700 (PDT) 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 4QQs160gylz4x2k; Wed, 24 May 2023 10:06:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684886794; bh=DDaWs+DOiKeOYB2EZ302nVs8682iKofQYavZstdYi9k=; h=Date:From:To:Cc:Subject:From; b=EZgJujH/dqxahAoxt1xfWOt+Q/2OvhdvutFf6DSt2ndH0dgMY47tryDJ6t0RcaZSE 911Fskfe6ES26QCje5Vks5m16aifxuepUSjjAxARlx5z0rb1bY92ClMQvr5rJ9bgvk QAtV2kmtE5R93IxiVZl5Vbbr3RawkP++V04DBli+1N1jOqK94Sf8KsYURby+X2z9Ja AN074ujMAKuOV9d+2b5yjy0J6UzBJarGuKO7sGtHNX4yB8BUEnrMJVM8I1LJxrUL44 eONeiv99BlrnaavI/FHP4sbjtLEeLBUhm/+C0LIYM/IMUmCLAyrfshoJYTAt3jmFxY FKPgPYeJ1N0aw== Date: Wed, 24 May 2023 10:06:33 +1000 From: Stephen Rothwell To: Christian Brauner , Andrew Morton Cc: Danila Chernetsov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs-brauner tree with the mm tree Message-ID: <20230524100633.0d2148b5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UK.RlxxSvAaRLATgs2SD+ZO"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/UK.RlxxSvAaRLATgs2SD+ZO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/ntfs/mft.c between commit: e7c5ef2adfdf ("ntfs: do not dereference a null ctx on error") from the mm tree and commit: ee3b4556cee8 ("ntfs: do not dereference a null ctx on error") from the vfs-brauner tree. I fixed it up (the latter seems to be a newer version, so I just used that) 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. --=20 Cheers, Stephen Rothwell --Sig_/UK.RlxxSvAaRLATgs2SD+ZO Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRtVQkACgkQAVBC80lX 0Gyp0Qf+Juu6VaxfPnG73d9TU2VLJ0r0LT1Tr5p2Ne5FLKJ/66CmCfNb8V9IXKcb xF1FIJ7lbmBTntKpRwuptDNIyh31bwGI04vHhEp3YJv6/AjT6sp0ayfrOB0aoLNB HYJNFN1HMhoOoAPYS/WxwUtOLr77xXh4b8E6Ek3bFQH/1pvkGf1gkjL/c/I9zuLf o/hmo54nGZ9qd3Pc8Ydkkp7tNxrWVIxuY6CRAMEnybydRnbXa3OWzt31KnARR8Kv OrnDM7uAeWp0zND6od2cf2wn/zevQg6D5p664IyVToUuZXknF2MP6yLy9oknT0F8 IVYsMZtCYa9+iQqWbJO1pUnGqklUIg== =kOwa -----END PGP SIGNATURE----- --Sig_/UK.RlxxSvAaRLATgs2SD+ZO--