From patchwork Fri Aug 2 00:38:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11071627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1CE2613B1 for ; Fri, 2 Aug 2019 00:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 001CF28796 for ; Fri, 2 Aug 2019 00:38:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E788E287B5; Fri, 2 Aug 2019 00:38:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AE4428796 for ; Fri, 2 Aug 2019 00:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388459AbfHBAiI (ORCPT ); Thu, 1 Aug 2019 20:38:08 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:39839 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726825AbfHBAiI (ORCPT ); Thu, 1 Aug 2019 20:38:08 -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 4607YS10mXz9sBF; Fri, 2 Aug 2019 10:38:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1564706284; bh=JIiX2SDsIiJ0ZidVaj3bi2N9QTRTYubHyhF24hu4qDc=; h=Date:From:To:Cc:Subject:From; b=XJobggZ5lPRTbEk+Pex4FGyV/H8rBEhVkjJG23NPqb41L35Hmwh6eBhxGqaMiVM5J 0aHoshn3CEybX0LqWyg/ogQJWoJnNRSjhwDwqMvu4W2TZ0UVcINKwRCxb2sbRU5a82 Z8KSqafgQRTE7OcJx4VRhvGAluY5MDZjAGjuv/FgkZPf1svvxMC3QRBpgy6hxBluLy KVm+nj7q/9+mLkpKmjw2xPrcdG/YSlEjv7MBwWuPHjEIJlmdm7FaJp2RMn82GLcD1i JCuov68fsaFxmBLnuPfUH+e5U4fDq4648J8MBLo7tt2fX4XsdHFdnV+iY4EG+wlQHB 3H+Sgm1wiszSg== Date: Fri, 2 Aug 2019 10:38:03 +1000 From: Stephen Rothwell To: Jonathan Corbet , Steve French , CIFS Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mauro Carvalho Chehab Subject: linux-next: manual merge of the jc_docs tree with the cifs tree Message-ID: <20190802103803.7dfb5659@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the jc_docs tree got a conflict in: Documentation/admin-guide/cifs/todo.rst between commit: 46c8a6b4c39e ("smb3: update TODO list of missing features") from the cifs tree and commit: f139291c7130 ("docs: fs: cifs: convert to ReST and add to admin-guide book") 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. diff --cc Documentation/admin-guide/cifs/todo.rst index edbbccda1942,95f18e8c9b8a..000000000000 --- a/Documentation/admin-guide/cifs/todo.rst