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=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 EBCA5C46478 for ; Thu, 4 Jul 2019 06:59:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C406621882 for ; Thu, 4 Jul 2019 06:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727238AbfGDG6x (ORCPT ); Thu, 4 Jul 2019 02:58:53 -0400 Received: from mga05.intel.com ([192.55.52.43]:21187 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbfGDG6x (ORCPT ); Thu, 4 Jul 2019 02:58:53 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2019 23:58:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,449,1557212400"; d="scan'208";a="164560918" Received: from hao-dev.bj.intel.com (HELO localhost) ([10.238.157.65]) by fmsmga008.fm.intel.com with ESMTP; 03 Jul 2019 23:58:51 -0700 Date: Thu, 4 Jul 2019 14:42:08 +0800 From: Wu Hao To: Greg KH Cc: Moritz Fischer , linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Xu Yilun , Alan Tull Subject: Re: [PATCH 05/15] Documentation: fpga: dfl: add descriptions for virtualization and new interfaces. Message-ID: <20190704064208.GA2722@hao-dev> References: <20190628004951.6202-1-mdf@kernel.org> <20190628004951.6202-6-mdf@kernel.org> <20190703175926.GA14649@kroah.com> <20190703233822.GB15825@hao-dev> <20190704053719.GA347@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190704053719.GA347@kroah.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 04, 2019 at 07:37:19AM +0200, Greg KH wrote: > On Thu, Jul 04, 2019 at 07:38:22AM +0800, Wu Hao wrote: > > On Wed, Jul 03, 2019 at 07:59:26PM +0200, Greg KH wrote: > > > On Thu, Jun 27, 2019 at 05:49:41PM -0700, Moritz Fischer wrote: > > > > From: Wu Hao > > > > > > > > This patch adds virtualization support description for DFL based > > > > FPGA devices (based on PCIe SRIOV), and introductions to new > > > > interfaces added by new dfl private feature drivers. > > > > > > > > [mdf@kernel.org: Fixed up to make it work with new reStructuredText docs] > > > > Signed-off-by: Xu Yilun > > > > Signed-off-by: Wu Hao > > > > Acked-by: Alan Tull > > > > Signed-off-by: Moritz Fischer > > > > --- > > > > Documentation/fpga/dfl.rst | 100 +++++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 100 insertions(+) > > > > > > This doesn't apply to my tree, where is this file created? > > > > Hi Greg, > > > > >From the cover-letter, Moritz mentioned, dfl.txt has been converted to .rst > > in linux-next. I think this patch is created on top of that by Moritz. > > > > "Note: I've seen that Mauro touched Documentation/fpga/dfl.rst in linux-next > > commit c220a1fae6c5d ("docs: fpga: convert docs to ReST and rename to *.rst")" > > Ok, but I can't take this patch just because the file is converted in > someone else's tree :( Oh.. if that patch is merged from fpga tree, then we wont have this problem. :( So do you have any suggestions on what should i do now? wait that patch goes to offical release, and then resubmit this patch? Hao