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 557B6C433FE for ; Mon, 28 Nov 2022 17:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231675AbiK1RgG (ORCPT ); Mon, 28 Nov 2022 12:36:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232390AbiK1RgF (ORCPT ); Mon, 28 Nov 2022 12:36:05 -0500 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C47EA24962; Mon, 28 Nov 2022 09:36:01 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id E006A5C00DB; Mon, 28 Nov 2022 12:35:58 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 28 Nov 2022 12:35:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1669656958; x=1669743358; bh=aKzeEdpO8C H2HdtCvIgLs+oL7GmiAQ4112GY4wqfTWI=; b=VaJI7QNb/7jTI79BIHjdowt7vX RdUnTi2zZ3sdgDH5DXzo+Zo54MSE533K4dP6tgNAunpVKTLjRKP9Ev2UJb8ksMsf V2b8fHdsNQWL00cv0oTNUVLCQ47jcZZ7rdyAPhS6dlJngXvdp0LxfNcjLKEJb/lZ 8my5ZIlYhe7rsFPDahpKqQYXFMHbSjDK8XJP9vsHeXIsrL8EVoXfHKqXr4zzJBju iG6ibrFspKUoVxYHYchnPHoM4CJo5aNyV1whZQBUTw9meTW/VFXrZA6aFwX6+vPb /cVyLhP9S+FN+Z6AoPJ8p7JOIuhL6QsCfTR8FmXfSgpCPEf7IelssomyoaNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1669656958; x=1669743358; bh=aKzeEdpO8CH2HdtCvIgLs+oL7Gmi AQ4112GY4wqfTWI=; b=f1yRnY6YIPO+eGpZwJ2dDhzN5NsfAWDVCFLu7llhxFQK pxF7WqSzQmop2S4fQpGbCeWTgejZaDxvhh4f4JDkTmnPyxOEzNKgDEI1zT+6lWFr UXfF8Gc5ZoWFUsNyqQpjOBw4D/Svz0eudlN/gffMUu/0VVKmoxIWHyrFbe2n6P+O NZN2A50J3qibGqAcBONiEmzjdbyod04FJtT32NLqzGrfGBgErcwUP7x0mya6mt74 O/okDfGw0cwpM24Vbu3+AoOAFM5FvcDd+hFx8FV+64d/SPqfe9jbnuAg65r9uIMy bSZAB2r/V1vlVGGAQN5GJYDN+0YsPSwEG2TEIov8xQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrjedvgddutdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Nov 2022 12:35:57 -0500 (EST) Date: Mon, 28 Nov 2022 18:35:56 +0100 From: Greg KH To: Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the driver-core tree Message-ID: References: <20221128133600.14ce44bf@canb.auug.org.au> <20221128234408.7a4dec34@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221128234408.7a4dec34@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Nov 28, 2022 at 11:44:08PM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 28 Nov 2022 12:50:03 +0100 Greg KH wrote: > > > > On Mon, Nov 28, 2022 at 01:36:00PM +1100, Stephen Rothwell wrote: > > > > > > After merging the driver-core tree, today's linux-next build (powerpc > > > ppc64_defconfig) failed like this: > > > > > > arch/powerpc/platforms/book3s/vas-api.c: In function 'vas_register_coproc_api': > > > arch/powerpc/platforms/book3s/vas-api.c:590:38: error: assignment to 'char * (*)(const struct device *, umode_t *)' {aka 'char * (*)(const struct device *, short unsigned int *)'} from incompatible pointer type 'char * (*)(struct device *, umode_t *)' {aka 'char * (*)(struct device *, short unsigned int *)'} [-Werror=incompatible-pointer-types] > > > 590 | coproc_device.class->devnode = coproc_devnode; > > > | ^ > > > drivers/misc/cxl/file.c: In function 'cxl_file_init': > > > drivers/misc/cxl/file.c:687:28: error: assignment to 'char * (*)(const struct device *, umode_t *)' {aka 'char * (*)(const struct device *, short unsigned int *)'} from incompatible pointer type 'char * (*)(struct device *, umode_t *)' {aka 'char * (*)(struct device *, short unsigned int *)'} [-Werror=incompatible-pointer-types] > > > 687 | cxl_class->devnode = cxl_devnode; > > > | ^ > > > > > > Caused by commit > > > > > > ff62b8e6588f ("driver core: make struct class.devnode() take a const *") > > > > > > I have used the driver-core tree from next-20221125 for today. > > > > Hm, how do we resolve problems like this where an api changes in my > > branch but needs to be updated in another branch that is not in Linus's > > tree yet? > > That is not the case here: > > $ git show ff62b8e6588f:arch/powerpc/platforms/book3s/vas-api.c | grep coproc_devnode > static char *coproc_devnode(struct device *dev, umode_t *mode) > coproc_device.class->devnode = coproc_devnode; > $ git show ff62b8e6588f:drivers/misc/cxl/file.c | grep cxl_devnode > static char *cxl_devnode(struct device *dev, umode_t *mode) > cxl_class->devnode = cxl_devnode; > > You just need to add a commit to your tree that updates the missed cases. Ok, patch sent out, let's see if 0-day objects... thanks, greg k-h