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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6122EC433F5 for ; Mon, 10 Jan 2022 09:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yISaH+GfrIwv1Wxs/D54gXEMr/JSHI4AU5ul7y8febU=; b=fWMTyPv0/9N6bsuwmuFYV+msUA vS5Y9QoDLK22gUGS6+vORt2QKM76h1sDGoAoGBnApa2fBoifCa02SQk7T9mdk66UBQHFDMsIbqQAg iY6XvkOeOIh1uemeoOqbOAUtC8yTlrZvuGPwaBqlN7+84sBNb6q+eRKPqOUfOCfnEQmxjHGZ8o5Sp gAqKtEsPqA7by2BjsfMWAkyEFiucQTmYperqxFCEkFhSCEr1dlClfK8y+BdyKSG/IKJbgA3K+LeCs Vl8MidXdzTvTOJARIfOjAIsViLYWuzeid+lyiF+BwarJuk3n6XYyRSZnhim5vO+zXGMLiJEU4Xtcu Fbn8hHdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6r62-00AS7m-6m; Mon, 10 Jan 2022 09:36:10 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6qu9-00AKt2-QV for linux-arm-kernel@lists.infradead.org; Mon, 10 Jan 2022 09:23:56 +0000 Received: by mail-wm1-x331.google.com with SMTP id w26so2392782wmi.0 for ; Mon, 10 Jan 2022 01:23:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9jz9tNwdzLsw7w4Zl2qHQumH6RcFiB0/JZN/3mnViHE=; b=o74mvAvePykr8pBkRAIfGkCE+jZyOIQDE3u1T/KcLw9WFfYNPgiMXLQ6rjRdjAgEaL IRGLm9hsd99LkyblWxHEtDxolvDthX1Q86zYnzaGBJdHwSwDFIbKWJ4MtG+xESCxTBDs Yq6XDTyHyEUyJ0Aq6iNvtije8VaxppilvmVVUwlZdqzYCOdgqvy1WCjgPuCfJMof77LZ 1CGcz4B9I4SN3MrciU4lCfHLRUcX7CX+vz9U/VxD0kmF89Kdf1JdPmpx65PNaLda1WBM vuGfqgMSCDsQVHINFmq8W7CB0h2q6IPX7HQCF8JZoalvhEE9pc/R/FN8CuWMF8X4XJSW ud6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=9jz9tNwdzLsw7w4Zl2qHQumH6RcFiB0/JZN/3mnViHE=; b=TwP6BeFD8zF5hqjHRV2tehqwYDnXYBg4SKIPrEYeCl9DV8FDLpwkVP9holkm2rXIv1 Y03R3hsC9em/Qi0LZhBl2ildC4eya4x95H5MT/J4UyBGPwayo4MIt1McRsELAtiPVFyV s1CnbOdFc8P8wPPG/Vh6BdMNniMoBsj3bmXI+zPnvFpDJtWnPbMKieU/+KfmU0bW60PA kunmB/ij2qq3TWZ7CkS85b0w24/5CPh9uijeEUwZavaMwVS2wSBXfnhyGdV+6G8X2OvR kNbMnrIVOXy60SBmf2IvW9OCodtMxlCAVeOdUIctZzzjmib5u3ywp3aYobUjMUXQmm4e oeog== X-Gm-Message-State: AOAM530rBUxH6GsbEY7Q2dU2/92dIxpASEroMhRMQU7GE7JHj8rS8XvA iSX5zzUE1GfPiLj+8Q1QjJF+lFGgHOZubw== X-Google-Smtp-Source: ABdhPJzbFEoNkxF7535gvm2QMeTxG1bbLAD3RCO4UI4i+sGuXs4K/lvjLWKnVlad475XlMkoyKcgSQ== X-Received: by 2002:a05:600c:22c8:: with SMTP id 8mr12087174wmg.150.1641806631154; Mon, 10 Jan 2022 01:23:51 -0800 (PST) Received: from ?IPv6:2001:861:44c0:66c0:94e5:2e36:6bcc:a9f1? ([2001:861:44c0:66c0:94e5:2e36:6bcc:a9f1]) by smtp.gmail.com with ESMTPSA id p62sm5921856wmp.10.2022.01.10.01.23.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jan 2022 01:23:50 -0800 (PST) Subject: Re: [GIT PULL] amlogic fixes for v5.17-rc To: Olof Johansson Cc: soc@kernel.org, arm@kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org References: <7e40328b-6645-4343-3050-73dcfb2cefcb@baylibre.com> From: Neil Armstrong Organization: Baylibre Message-ID: Date: Mon, 10 Jan 2022 10:23:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220110_012353_965675_D16DC9E6 X-CRM114-Status: GOOD ( 21.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 08/01/2022 22:26, Olof Johansson wrote: > On Mon, Jan 03, 2022 at 04:13:44PM +0100, Neil Armstrong wrote: >> Hi, >> >> Here's a couple of DT fixes for v5.17-rc1, they fix the UART compatibles of >> the ARMv7 Amlogic SoCs and by the way keep earlycon working after [1] has been >> applied by greg in the tty branch for 5.17. >> >> I know it's early for 5.17-rc1, but at least it's in the pipe. >> >> I based the changes on your dt-5.17 tag pushed to linus for 5.17-rc1, >> if necessary I can rebase on v5.16-rcX. > > Hi Neil, > > It looks like this branch is based on our arm/dt branch? Please don't base your > topics on our branches, it'll be awkward if we ever need to rebuild them (it's > happened a few times, but we try very hard to avoid it). Sure, no worries, I tried but I was wrong > > In this case, you should have based your contents on top of your latest dt > branch (if it would have had conflicts), not ours. Noted for next time > > Mind rebuilding and send a new pull request? Sure, rebasing right now on proper 5.17-rc DT tag > > Thanks, > > > -Olof > Thanks, Neil _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel