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.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 EE279C64EB1 for ; Fri, 7 Dec 2018 07:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B845520850 for ; Fri, 7 Dec 2018 07:08:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B845520850 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lwn.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726041AbeLGHIg (ORCPT ); Fri, 7 Dec 2018 02:08:36 -0500 Received: from ms.lwn.net ([45.79.88.28]:36390 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726020AbeLGHIf (ORCPT ); Fri, 7 Dec 2018 02:08:35 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id 32F092DF; Fri, 7 Dec 2018 07:08:32 +0000 (UTC) Date: Fri, 7 Dec 2018 00:08:28 -0700 From: Jonathan Corbet To: Stephen Rothwell Cc: Theodore Ts'o , Linux Next Mailing List , Linux Kernel Mailing List , NeilBrown , Eric Biggers Subject: Re: linux-next: manual merge of the jc_docs tree with the fscrypt tree Message-ID: <20181207000828.3dead855@lwn.net> In-Reply-To: <20181207115340.2465a854@canb.auug.org.au> References: <20181207115340.2465a854@canb.auug.org.au> Organization: LWN.net X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 7 Dec 2018 11:53:40 +1100 Stephen Rothwell wrote: > Today's linux-next merge of the jc_docs tree got a conflict in: > > Documentation/filesystems/index.rst > > between commit: > > 1b71a6809f96 ("fs-verity: add a documentation file") > > from the fscrypt tree and commit: > > 7bbfd9ad8eb2 ("Documentation: convert path-lookup from markdown to resturctured text") > > from the jc_docs 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. That fix is as good as any, thanks. jon