From patchwork Fri Jun 23 10:32:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9806203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1EA4160349 for ; Fri, 23 Jun 2017 10:32:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0623C2785D for ; Fri, 23 Jun 2017 10:32:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED9BC2869A; Fri, 23 Jun 2017 10:32:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C2592785D for ; Fri, 23 Jun 2017 10:32:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: References:In-Reply-To:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=639Empvr5HHnXsO/PncM5PTVfn1LSsVZDKE4TCYoHhM=; b=AvYVz4TkigTvLC plA2UZo4ZfeKMgqoY73q10guIYsHARmoiTMKsVNlVOe5UisNHff/0Uh5fjMK7v9oTve1v3bmm7DoK +H05jKRoxbDLCQn0Kj44aH4ltF4lLqbu9X3Oe6oH/xaosF8jG52yY8LZHf/LTTelqYcMzo1TDSBa0 YoYcjqSYakbt/u476l7uAVDw+jBPAvkxg8DxU9MbLE4YhLM7co253A7rSLsMatmrq7QKBvNM7hav8 PeBh+HBHBTnOcxwQfaitzW5VZszgEK5zx0NumPhZ4iviNsru3XFJSNlGS7DbV0jV2ZQYkuAQ5Gm88 TZIHcy4oL84DxqKIydng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dOLtE-0001UU-1m; Fri, 23 Jun 2017 10:32:36 +0000 Received: from mail-ot0-x244.google.com ([2607:f8b0:4003:c0f::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dOLtA-0001Tg-8V; Fri, 23 Jun 2017 10:32:34 +0000 Received: by mail-ot0-x244.google.com with SMTP id q16so4395928otb.0; Fri, 23 Jun 2017 03:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=CocGKcHQav4Y9hkdVHxSPS6vzto5Jk4v6l/4HfV0IsU=; b=PJYBTlYLBCL+pmyEfMxZY5hw95tGtWiWnlg/QUge8OmLklQw+++italSbfu15RH88R pmG8vnynGaSPC6D8Zo97VnQAq5oacMakqqB5jEhimKRHtXCBMWgLcxUJqm4tekyqnbFh GyjH2h0P+z1VuFKK/6p3eXQw/NQgqzx+G01W336KHyTmOCNyAs3wbQKDglTWKIVYtHdq eRmz4NVqxGSKppYUvSSGMfTBD9mSccfehUO7ho/gKh/Rmp/n4mgY3Q4mXOh3X706bjpU +wXo0ln2E5MwJ76vlWbDr9IMAKSQd+VZH/N0wiyDCOw7JKrpHzHoyK1MyFaSsEi1dXZK ZNiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=CocGKcHQav4Y9hkdVHxSPS6vzto5Jk4v6l/4HfV0IsU=; b=DtRGj7mL9VxiZlA0JQ22L9v+qPsAV9EZkdiw5MSqaenTvwamyO6MEYaWkzEsyK0Hxs 7tNmBqoY+zWPbtGKy+AKASnwvwVWIOHb+p0XNkUfv/sH/yqQRRAnMtm4fHlrn54HB641 1MsDQCM+pkC17TR+D/On7MZRvfB1H0K8RvudpNQIKbyxPY3RXM6gLqBnsuMGAl8x2Sem OqPNMi43NJTjkDtGf3txseSWbqNF4CqMh/ogQkVvtsL47d2kXsqW8MqcMCbKY3DaeQ7o OyKNQ2n0l9sEP9HEMwC8vZKVXTFk0VHjjB1IWJhgp68WIXA4SCt+Y5zDdDK4fFtHNGoS CeIA== X-Gm-Message-State: AKS2vOyL5qe52AWABkJ0pN0laSsEQyvfX6tMiiw6rIISkuMOLGYeGN6g +Qd5WNH9XBKwMRBMcZX9Jzew2A12zg== X-Received: by 10.157.9.33 with SMTP id 30mr3967308otp.71.1498213930870; Fri, 23 Jun 2017 03:32:10 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.21.29 with HTTP; Fri, 23 Jun 2017 03:32:10 -0700 (PDT) In-Reply-To: References: <25946bae-31fb-ab97-aedb-92681cf603c4@gmail.com> From: Arnd Bergmann Date: Fri, 23 Jun 2017 12:32:10 +0200 X-Google-Sender-Auth: LuLU-FOqkhkAlsqWC4gsUmEZs4I Message-ID: Subject: Re: [GIT PULL] ARM: Mediatek soc drivers for v4.13 To: Matthias Brugger X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170623_033232_405267_5C8F0888 X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "moderated list:ARM/Mediatek SoC..." , arm-soc , Christophe JAILLET , "linux-arm-kernel@lists.infradead.org" , Mars Cheng , Shailendra Verma Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Jun 20, 2017 at 12:10 PM, Matthias Brugger wrote: > Hi Olof and Arnd, > > Olof merged my v4.12-next-dts32 and v4.12-next-dts64 branch, but didn't > merge this one. AFAICT, he merged it but forgot to send an email about it. > Actually dts64 depends on a this branch as it provides the dt-binding header > for the scpsys on mt6797. Not sure if I screwed up here having such > dependencies between my branches. You did, but it already went in unnoticed and I now get this build error in next/dt: make O=obj-arm64 ARCH=arm64 dtbs CROSS_COMPILE=/home/arnd/cross-gcc/bin/aarch64-linux- -skj30 In file included from ../arch/arm64/boot/dts/mediatek/mt6797-evb.dts:16:0: ../arch/arm64/boot/dts/mediatek/mt6797.dtsi:15:10: fatal error: dt-bindings/power/mt6797-power.h: No such file or directory #include I've fixed it up for now with this patch: From 10c235cdc9350c6da40760f7468d1189bfd4e7ff Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 23 Jun 2017 12:28:34 +0200 Subject: [PATCH] arm64: dts: mediatek: don't include missing file This resolves a build error in the next/dt branch: In file included from arch/arm64/boot/dts/mediatek/mt6797-evb.dts:16:0: arch/arm64/boot/dts/mediatek/mt6797.dtsi:15:10: fatal error: dt-bindings/power/mt6797-power.h: No such file or directory 003f5d0c3462 ("arm64: dts: mediatek: add clk and scp nodes for MT6797") Signed-off-by: Arnd Bergmann Once you actually start using the symbols from mt6797-power.h, you'll have to add this back, but after the merge window it will be there from the drivers branch. In the future, please make sure each branch can be built by itself and produce a working kernel image, including "make dtb". Arnd diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi b/arch/arm64/boot/dts/mediatek/mt6797.dtsi index 3512c8e6dc65..31088a9f71de 100644 --- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi @@ -12,7 +12,6 @@ */ #include -#include #include #include