From patchwork Wed Oct 21 00:00:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11848095 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 91F40C4363D for ; Wed, 21 Oct 2020 00:02:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 119D7207FF for ; Wed, 21 Oct 2020 00:02:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HZrXIVsm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="NfD5Puig" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 119D7207FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=RxwY2SF4sxM3XeMVtWwfdHe70omz9KcLIxZwzEhrQrA=; b=HZr XIVsmXnGCcVUFLS98y6fie80u+xrjnaLJsNWrxgy3R4rBLcmdL6Pwz50vyeSNVLBDh0XD5tFiaNBF /fyOPXb6sfNQXl5FmkAmxvLCyCY2GEknHCe5iVNBcDegb12wy12HuHmYl99z3TPVadbN+X8gcoF6t P55RmnJY2oExn6PFZbKRa9kmZq5gHHDWH4Wjw20K6rKS/Z4BhzLCwLNnop285xMSoV0f0WXqxZQkt O5jAdR0th1+fKmiVk/UIIgpiRyoM40r1V27J+sBgBSg+XGVibyZ+XLtWyCA2kKkuvz6KZCMhB/ezc YIDMmw6bZ2cQQfttimZV8OHDpBQyqlg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV1Yx-0004gK-Sv; Wed, 21 Oct 2020 00:01:07 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV1Yt-0004dG-2U for linux-arm-kernel@lists.infradead.org; Wed, 21 Oct 2020 00:01:06 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CG9cf4SdNz9sSG; Wed, 21 Oct 2020 11:00:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1603238452; bh=0DXK4NIMtfSfXVyJsOvho9PCtSfMjF5Wwslj97gXnwM=; h=Date:From:To:Cc:Subject:From; b=NfD5Puig5wOEsyd45kbJmaRIJyr5NVLCi7Wo1x794wVQZiqaSUmXToxdeGYXtanHR MRIAp3bIoV85/3/Ou9k3Dg77/sV1l41y3N9mFExcS3Zbo8tubB9LkQBofhLmN6k3sd d+83Iv0bkppaXQ/L4u3l6vgfVVJMktd8Eo7kq2MQ31lo6y5yMf8h5L3F/6MqdArfzX yNR8nCB+dnDKv9Y3x5g9YMm5A+4ZYe9v3Z+apt5+utoXB8JYwX0DrxDNFNwdIhqiGs CdeMU1A/EZUYFVUsv/+hAggwOp5hbXclJxhi3rH/4vCCu/LP41ccufg9PnjLy95DHt xrlW+5ZQfdfng== Date: Wed, 21 Oct 2020 11:00:49 +1100 From: Stephen Rothwell To: "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the pm tree with the arm-soc tree Message-ID: <20201021110049.61cc4f61@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_200103_351204_0284F45E X-CRM114-Status: GOOD ( 16.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Grzegorz Jaszczyk , Santosh Shilimkar , "Rafael J. Wysocki" , Linux Kernel Mailing List , "Andrew F. Davis" , Tero Kristo , Linux Next Mailing List , Ulf Hansson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the pm tree got a conflict in: drivers/soc/ti/Makefile between commit: dc1129564a01 ("soc: ti: pruss: Add a platform driver for PRUSS in TI SoCs") from the arm-soc tree and commit: bca815d62054 ("PM: AVS: smartreflex Move driver to soc specific drivers") from the pm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/soc/ti/Makefile index 18129aa557df,5463431ec96c..000000000000 --- a/drivers/soc/ti/Makefile