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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 C1DFFC83011 for ; Mon, 30 Nov 2020 17:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C0C42074A for ; Mon, 30 Nov 2020 17:41:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="VYO+8RMd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387728AbgK3Rkt (ORCPT ); Mon, 30 Nov 2020 12:40:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:45410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387585AbgK3Rkr (ORCPT ); Mon, 30 Nov 2020 12:40:47 -0500 Received: from localhost (129.sub-72-107-112.myvzw.com [72.107.112.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1F37720789; Mon, 30 Nov 2020 17:40:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606758006; bh=Po0Vni3vuUdizhdl3Kfio3Vs8WN0WIvGW+tvezPdIWM=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=VYO+8RMd1QSy/WXiWvosT497TGV+uAL9sNSFnR/1XRVx9xodVjlHd25Fm8lYoZrZz ruJcQFINYTk8LOaj1lXFNHznM7c5lSFXJYU6Y4f5M0Thtc4MY4b/HpxZUIoLbUaWcn /oXffkOiWW50cc+Xycx9i4+0K+AHoT19YuiShj7U= Date: Mon, 30 Nov 2020 11:40:04 -0600 From: Bjorn Helgaas To: Borislav Petkov Cc: Bjorn Helgaas , Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Alex Shi , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tip tree with the pci tree Message-ID: <20201130174004.GA1090686@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201130102120.GB6586@zn.tnic> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Nov 30, 2020 at 11:21:20AM +0100, Borislav Petkov wrote: > On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/x86/pci/i386.c > > > > between commit: > > > > ace091d17272 ("x86/PCI: Fix kernel-doc markup") > > > > from the pci tree and commit: > > > > 638920a66a17 ("x86/PCI: Make a kernel-doc comment a normal one") > > > > from the tip tree. > > Bjorn, I fixed up the comment too, while picking up, see below. But I > don't care all that much which one to take so I leave it up to you to > decide. :-) I dropped ace091d17272 ("x86/PCI: Fix kernel-doc markup") from my tree so we keep your comment improvements. Thanks! > commit 638920a66a17c8e1f4415cbab0d49dc4a344c2a7 > Author: Alex Shi > Date: Fri Nov 13 16:58:14 2020 +0800 > > x86/PCI: Make a kernel-doc comment a normal one > > The comment is using kernel-doc markup but that comment isn't a > kernel-doc comment so make it a normal one to avoid: > > arch/x86/pci/i386.c:373: warning: Function parameter or member \ > 'pcibios_assign_resources' not described in 'fs_initcall' > > [ bp: Massage and fixup comment while at it. ] > > Signed-off-by: Alex Shi > Signed-off-by: Borislav Petkov > Link: https://lkml.kernel.org/r/1605257895-5536-5-git-send-email-alex.shi@linux.alibaba.com > > diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c > index fa855bbaebaf..f2f4a5d50b27 100644 > --- a/arch/x86/pci/i386.c > +++ b/arch/x86/pci/i386.c > @@ -366,9 +366,9 @@ static int __init pcibios_assign_resources(void) > return 0; > } > > -/** > - * called in fs_initcall (one below subsys_initcall), > - * give a chance for motherboard reserve resources > +/* > + * This is an fs_initcall (one below subsys_initcall) in order to reserve > + * resources properly. > */ > fs_initcall(pcibios_assign_resources); > > > > -- > Regards/Gruss, > Boris. > > SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg