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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS autolearn=no 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 C5573C3F68F for ; Wed, 18 Dec 2019 11:53:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CBB2206E0 for ; Wed, 18 Dec 2019 11:53:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="J48SMSEi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CBB2206E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7BD06E2D5; Wed, 18 Dec 2019 11:53:36 +0000 (UTC) Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 660DE6E2D5 for ; Wed, 18 Dec 2019 11:53:35 +0000 (UTC) Received: by mail-ot1-x344.google.com with SMTP id p8so2184767oth.10 for ; Wed, 18 Dec 2019 03:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zxFvtFTUUwA+ohr/zrRpzlWmODeoFm2SoCv2eQrZOew=; b=J48SMSEiIFOTZZrDBYTL8471LENC+N0zDlbkFHNuPd/2b+nORHyKXx8d+YGno8LNAG NtHMUA/vq9d1ti4k0oikgyLm1T9J0OAssIWOJY5Crw9urZmg41ZGRIRDsPY/zGDMqEhx 66BavbQBE34xD3VQEIkVDXmLLsvxLewI1nvW8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=zxFvtFTUUwA+ohr/zrRpzlWmODeoFm2SoCv2eQrZOew=; b=gCfUc7gYxHquBlVk6i/Mq1DKgeDgxVGsMpxuixVFWhHq6uUQ6e/ML/y0cpfvEFqvEa QMFtuvGDyY1YyP5F6mt0LYRTopbpBcVsdjczncxB+UxauwbkFtrXC21CZWZxeEkdQsUq uIGcVd5CNHwdnkXEaLfJiYEYTJ16AJuIexJd/KKd1HgsvqZiHFrXIWEHYq3f6H++VuMK DTWrP1FYpFdEKMk9kSsXqP0xHrcLC5eEf4izLrjKvDDC/nydThIPEVpZQWFZdUKL9wQZ RaBhHeMQSDPYCbq08QQIZ2uSPOgXfMlvtNsVy3bnLdvlv8lbWajEHDLEQ8AKobAJ4/aR durA== X-Gm-Message-State: APjAAAU1U3ZND7rJrkhB5tzei4zHwE+LJ6/GLGILC5FYPPa7L3o3J5CP dtlPXUgHXp3ihq2zjwMsC5b5I0vP1lO5W2/1pBnGqA== X-Google-Smtp-Source: APXvYqzOWxFUYC1FyvGnADEA9Hj69nxuYFuE8i0P3qMz16x3t8aw/ipFN63K/R08PfO4EqHEfOLYiOtz+OqGLgE1lF4= X-Received: by 2002:a05:6830:1415:: with SMTP id v21mr2319204otp.188.1576670014731; Wed, 18 Dec 2019 03:53:34 -0800 (PST) MIME-Version: 1.0 References: <20191216122331.43c766f1@canb.auug.org.au> <20191217131937.GZ624164@phenom.ffwll.local> <20191218072204.06ca0cd9@canb.auug.org.au> In-Reply-To: <20191218072204.06ca0cd9@canb.auug.org.au> From: Daniel Vetter Date: Wed, 18 Dec 2019 12:53:23 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wolfram Sang , Intel Graphics , Linux Kernel Mailing List , DRI , Wolfram Sang , Linux Next Mailing List , Icenowy Zheng Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Dec 17, 2019 at 9:22 PM Stephen Rothwell wrote: > > Hi Daniel, > > On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter wrote: > > > > On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote: > > > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe': > > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration] > > > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > > > | ^~~~~~~~~~~~~ > > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion] > > > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, > > > | ^ > > > > > > Caused by commit > > > > > > 6aa192698089 ("drm/bridge: Add Analogix anx6345 support") > > > > > > interacting with commit > > > > > > 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API") > > > > > > From Linus' tree. > > > > > > I have applied the following fix up patch for today: > > > > > > From: Stephen Rothwell > > > Date: Mon, 16 Dec 2019 12:11:19 +1100 > > > Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy() > > > > > > Signed-off-by: Stephen Rothwell > > > > Thanks pulled into drm-next since I just processed the first drm-misc-next > > pull. > > Thanks. For the future, though, merge fixes like this should be part > of the actual merge commit to avoid bisection problems. I flip flop on this one, between retaining your contribution explicitly and merging them in. Usually I squash them in, but this felt substantial enough to retain explicitly. Worst case if someone is unlucky they need to git bisect skip once. I guess next time I should do a topic branch, apply it there on top of the pull, and then pull that in so that it's both pretty history and no bisect hole. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel