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=-6.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7DDC2C55ABD for ; Wed, 11 Nov 2020 12:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0700E20709 for ; Wed, 11 Nov 2020 12:48:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F1PZsI4a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725859AbgKKMsq (ORCPT ); Wed, 11 Nov 2020 07:48:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38566 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726207AbgKKMsp (ORCPT ); Wed, 11 Nov 2020 07:48:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605098924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zGXJ8V4La1S/QeUFBtdnXjusm+8Mn5insAGmUISpfHs=; b=F1PZsI4a6hTKkBvvX/ZppGYJoY5vAo+DeBNUieutbG+qSQl07V3bNko6OnLkEZPg2w7XmQ mpwv3wzSJqHa0iDkcmhY0RhqY3+1N06gCV7qw7WOgAgMPYz8cuQ8s5kgE2amRbBHl/hL8E 8j6nrQEh5oXFpEYzf41h7FI4KITPKss= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-RUX3uz6TNLyouJvaSrXywg-1; Wed, 11 Nov 2020 07:48:42 -0500 X-MC-Unique: RUX3uz6TNLyouJvaSrXywg-1 Received: by mail-wm1-f71.google.com with SMTP id o19so866800wme.2 for ; Wed, 11 Nov 2020 04:48:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=zGXJ8V4La1S/QeUFBtdnXjusm+8Mn5insAGmUISpfHs=; b=oswdGmbfFNoc+/r3nQAE8dXmDkRjcS6ReraEgVDtJECNdKwjt74RvAYx4ffmO1MDud o0kGRlH19Qbn6PaDKycWLIl/ie1Pqh3+/Zq+xNebFB3lzoMz57Adqmnxow38lvMBTXhR TvI20Qj3dSxJb3XRNaA4pc/ty1TlI2j3sEVSt0av2ROswad5qFHnhY2KwDWf0mJVs6pL IXthYmGrYeB7xgZA1aHbEqWd4HGg6WF5p9hM3BCYJjxpi4x8nKZEOQLOoI+PH8egaTK4 MqUY0HlywOjokfkFIZC37UNc1Io/PixRPguUSlx+3NoA25QqXzgpbrIX77yHbJevmHDZ HFIQ== X-Gm-Message-State: AOAM532jHzPN9eY3zECpgivPl8dO6/Bp0wl72dTGnDXf3bvjTvUUpIa7 +dC0xUt6JCOE87KaBjdfBIZcWlpR+BrjeJCxN+nL47tlpsb644vhbopVZqb5czVzQhH063+eGZx I/yJ0ApbKTD7jP003453S4A== X-Received: by 2002:a5d:5446:: with SMTP id w6mr20336613wrv.122.1605098921358; Wed, 11 Nov 2020 04:48:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBamKw/bg5c7+XjuuJx3l1SVoJhclL/t8sfniS6v7UD+Th0hPny5TfD72A5b6eS01hmH1NbQ== X-Received: by 2002:a5d:5446:: with SMTP id w6mr20336594wrv.122.1605098921214; Wed, 11 Nov 2020 04:48:41 -0800 (PST) Received: from redhat.com (bzq-79-181-34-244.red.bezeqint.net. [79.181.34.244]) by smtp.gmail.com with ESMTPSA id y11sm2305471wmj.36.2020.11.11.04.48.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 04:48:40 -0800 (PST) Date: Wed, 11 Nov 2020 07:48:36 -0500 From: "Michael S. Tsirkin" To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , Christian =?iso-8859-1?Q?K=F6nig?= , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20201111074811-mutt-send-email-mst@kernel.org> References: <20201102124327.2f82b2a7@canb.auug.org.au> <20201102051822-mutt-send-email-mst@kernel.org> <20201111171015.631ffd0e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201111171015.631ffd0e@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Nov 11, 2020 at 05:10:15PM +1100, Stephen Rothwell wrote: > Hi Michael, > > On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin" wrote: > > > > On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote: > > > > > > After merging the drm-misc tree, today's linux-next build (arm > > > multi_v7_defconfig) failed like this: > > > > > > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26: > > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size': > > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function) > > > 99 | return SIZE_MAX; > > > | ^~~~~~~~ > > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? > > > 6 | #include > > > +++ |+#include > > > 7 | #include > > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in > > > 99 | return SIZE_MAX; > > > | ^~~~~~~~ > > > > > > Caused by commit > > > > > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") > > > > > > but only exposed by commit > > > > > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include") > > > > > > I applied the following fix for today: > > > > > > From: Stephen Rothwell > > > Date: Mon, 2 Nov 2020 12:34:57 +1100 > > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included > > > > > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") > > > Signed-off-by: Stephen Rothwell > > > > Acked-by: Michael S. Tsirkin > > > > I guess it makes sense to pick this up for this release directly. > > I'll merge this unless there are any objections. > > Christoph is right that the include should not be conditional. But I > have not tested that that does not introduce some other problems. If there's a problem it will be a build failure - I'll put it in next for a while, this way we'll find out. > -- > Cheers, > Stephen Rothwell