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 X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10EA7C4CEC6 for ; Thu, 12 Sep 2019 13:44:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF97E2075C for ; Thu, 12 Sep 2019 13:44:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PA9DbItK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731650AbfILNoT (ORCPT ); Thu, 12 Sep 2019 09:44:19 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:39751 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731283AbfILNoT (ORCPT ); Thu, 12 Sep 2019 09:44:19 -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 46Tg3c4shxz9s7T; Thu, 12 Sep 2019 23:44:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1568295855; bh=Cnv4+khfML5daX7u0yJp0trudJnS360W+hZ6z7qUYSo=; h=Date:From:To:Cc:Subject:From; b=PA9DbItKEukRd8VthZ6RjjULpGvwsJLj1NoQ3jCvr6Q0v55SJUAicH7NkxyCNV8eL G6UETro3PasCGBKWUewmRIYSfys45zCwq6fPdQck4AZEl351XirDQSBeO7H19UCIzO uMcBgO/eh8q835F4FSucpZPj767eq+IELb838z1S0Q76aMGaXR1hKytE9jM9cUCvV2 Cj8F2YX3GaX5cjHek/n+Cpws0svnJK1VJmYWGbUhpZyN2fDbIT1mZq+EgsLm03estp 8fb/pnehQBL+y4jE6qrfzI7KQHvap/dxugrVZPH+CBF1Q0i8HOVVaEfEHhoc3ID+t5 2ABTGfvnbOUMA== Date: Thu, 12 Sep 2019 23:44:12 +1000 From: Stephen Rothwell To: Christoph Hellwig , Al Viro Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the configfs tree with the vfs-fixes tree Message-ID: <20190912234412.38998b12@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/DKU+xGk5GDUWWRExFeopTVV"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/DKU+xGk5GDUWWRExFeopTVV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the configfs tree got a conflict in: fs/configfs/symlink.c between commit: e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()") from the vfs-fixes tree and commit: 351e5d869e5a ("configfs: fix a deadlock in configfs_symlink()") from the configfs tree. These are slightly different version of the same fix. I fixed it up (I used the former version) 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_/DKU+xGk5GDUWWRExFeopTVV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl16S6wACgkQAVBC80lX 0GwIWgf+JsBvOediGgSa/jUOFbjXma+67AVDNxH8cHfeIr7ezolPvzKK05TU+St2 QASYltdXPi7D/CkfQXHYtumvlzAZcMrEDNqRjxXZBcwEIp8L7Y9F/K63r08iBeu0 CbvhVbPHmO9jA/bij9uS1zKSoFyUKTc38tw+gZBErLAPKDODbmE/SKFQepDDW6/w fdO+npXXhj+4159g0h3m9gSi0zQW6pdeJ5kxs7EEcbfajyae7YUFu3vchBBAAFf6 S8RbYcH5pHgQU0VMnxASxJdwsThD8Ar7O/RbKFln/gQKfxhLamndK3woO5nXmHUG i53FOGCwpsogmqcO7pw0F7kDQJeFAw== =6Hv8 -----END PGP SIGNATURE----- --Sig_/DKU+xGk5GDUWWRExFeopTVV--