From patchwork Tue Jan 7 12:06:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 11320811 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F686930 for ; Tue, 7 Jan 2020 12:06:28 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 0F0CE2080A for ; Tue, 7 Jan 2020 12:06:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F0CE2080A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ucw.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D74CD84F57; Tue, 7 Jan 2020 12:06:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GrustD0LTnlB; Tue, 7 Jan 2020 12:06:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 8587784EB9; Tue, 7 Jan 2020 12:06:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7B37DC0881; Tue, 7 Jan 2020 12:06:26 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id DB70FC0881 for ; Tue, 7 Jan 2020 12:06:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C998D84EED for ; Tue, 7 Jan 2020 12:06:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0D-xrkl8QqT3 for ; Tue, 7 Jan 2020 12:06:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from jabberwock.ucw.cz (jabberwock.ucw.cz [46.255.230.98]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4121184EB9 for ; Tue, 7 Jan 2020 12:06:23 +0000 (UTC) Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id A6FF41C2453; Tue, 7 Jan 2020 13:06:19 +0100 (CET) Date: Tue, 7 Jan 2020 13:06:19 +0100 From: Pavel Machek To: nobuhiro1.iwamatsu@toshiba.co.jp Message-ID: <20200107120619.GB1234@duo.ucw.cz> References: <20191229172557.GA18039@duo.ucw.cz> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cip-dev-bounces@lists.cip-project.org Sender: "cip-dev" Hi! > > Is there way to get to that version? Would it be possible to keep those > > tags in future? > > Please use 'git fetch --tags' . > With git normal commands, you can only get tags that are reachable from the branch. > In this case, execute as above. Thanks a lot for the pointer. I'm trying to prepare -cip-rt release, and I ran into differences I could not explain. After some head scratching, I realized they are in -cip, too: diff v4.19.88-cip16-rebase..v4.19.88-cip16. One more line of difference exists in newer version: git diff v4.19.91-cip17-rebase..v4.19.91-cip17 Any idea what is going on there? Which version is ok and which should be adjusted? Best regards, Pavel diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi index 86228e0596cb..570093ce77be 100644 --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi @@ -1550,56 +1550,267 @@ }; }; + rcar_sound,ssiu { + ssiu00: ssiu-0 { + dmas = <&audma0 0x15>, <&audma1 0x16>; + dma-names = "rx", "tx"; + }; ... +++ b/drivers/pinctrl/sh-pfc/pfc-sh7264.c @@ -1766,7 +1766,6 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { PF0MD_000, PF0MD_001, PF0MD_010, PF0MD_011, PF0MD_100, PF0MD_101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )) - } }, { PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1, GROUP( -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany