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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5DD6C433FE for ; Wed, 30 Nov 2022 10:58:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233552AbiK3K6x (ORCPT ); Wed, 30 Nov 2022 05:58:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229816AbiK3K6r (ORCPT ); Wed, 30 Nov 2022 05:58:47 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA1FC240A9; Wed, 30 Nov 2022 02:58:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669805926; x=1701341926; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=1/9FVSCZq4+TCgRUGOAmNJp/Xjr2BQ5w3SCgXfYNnK0=; b=PZrnxH3J6xdGa7qDklrPdtVu0uuChBtEZOS8MvOdW0VKaYKZICP8Y57G edkvQ/8s2Vi/s/433GjNokMVkeUSbrpoFH3DltluZgz1KGBmDrJuYttul 4lk9sZsVKwZXsSaK4tUxnkhXPuHRj03nn2AIb8iHRqCROsSixywV76qJD crOHkYHHjLxQubqQCeKbG8aVb0DCzxLkTmm51DHf357NIFzU9vBg1pwf3 IVzn7hVegunxezL35TSfce50h7CI1bLLurmqnKFLNQk1sWSI8HdAeKsnV tJvG6M/nJgaOZTVV57qq6mmHHYeoiu0UMrCXTlGBFtwKrAqG6F8AbZTt1 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="314059732" X-IronPort-AV: E=Sophos;i="5.96,206,1665471600"; d="scan'208";a="314059732" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2022 02:58:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="707603264" X-IronPort-AV: E=Sophos;i="5.96,206,1665471600"; d="scan'208";a="707603264" Received: from smile.fi.intel.com ([10.237.72.54]) by fmsmga008.fm.intel.com with ESMTP; 30 Nov 2022 02:58:45 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1p0Knb-002DuO-34; Wed, 30 Nov 2022 12:58:43 +0200 Date: Wed, 30 Nov 2022 12:58:43 +0200 From: Andy Shevchenko To: Greg KH Cc: Stephen Rothwell , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the usb tree Message-ID: References: <20221130131854.35b58b16@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 30, 2022 at 11:52:05AM +0100, Greg KH wrote: > On Wed, Nov 30, 2022 at 01:18:54PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > > drivers/xen/unpopulated-alloc.c:17:21: error: 'list_count' redeclared as different kind of symbol > > 17 | static unsigned int list_count; > > | ^~~~~~~~~~ > > In file included from include/linux/preempt.h:11, > > from include/linux/spinlock.h:56, > > from include/linux/mmzone.h:8, > > from include/linux/gfp.h:7, > > from drivers/xen/unpopulated-alloc.c:3: > > include/linux/list.h:662:22: note: previous definition of 'list_count' with type 'size_t(struct list_head *)' {aka 'long unsigned int(struct list_head *)'} > > 662 | static inline size_t list_count(struct list_head *head) > > | ^~~~~~~~~~ > > > > Caused by commit > > > > a9efc04cfd05 ("i915: Move list_count() to list.h for broader use") > > > > I have used the usb tree from next-20221129 for today. > > Odd, there is also one in the z2ram.c code but that isn't breaking :( > > Andy, I'm going to revert this series from the USB tree now, please fix > it up and resend. Sure. I think I will rename in my series list_count() to list_count_nodes(). This will be less invasive and should solve the issue(s). $ git grep -n -lw list_count drivers/block/z2ram.c drivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/scsi/hptiop.c drivers/scsi/hptiop.h drivers/xen/unpopulated-alloc.c $ git grep -n -lw list_count_nodes -- With Best Regards, Andy Shevchenko