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=-2.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,FAKE_REPLY_C,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 E91D2C43331 for ; Thu, 7 Nov 2019 21:18:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B866E2077C for ; Thu, 7 Nov 2019 21:18:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AZtaImNV"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="gDEqAWSa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B866E2077C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=X6ZaxpXzNzTDzGYJ+P0vBJP8RfCtxeQfahmmVAjdyj4=; b=AZtaImNVxbyCLm nFJeVQccUfVrEWotbIlJcKk2D2aqhd6jfrGO6pT5Vmll8KZsH7IuObNXovZW/wj6OLJYIQ0ybg0Nk NAPYRo8GESlZGVH6pouyUEeXX7Ry2UpcWR4w2lmJe4857eAT4wTq7g4njFzWiqGlUWt4dQoBsEPUw 8GPGouFTnxJR/tz3KDD+DavaArRWdi4F7nGu97aLhn6R6zyN7BbszvEWa9COIGM1yrrhfFiTDDxQD 5+9iiIPLmcp6zrXv+2boADI+OkVoXHw0GZ0RFgwldz7A+yvAvyCNGGMzV8Vbw5Z3FPgZWd4mGb6iH 2a38zjDdN61io0OOEFSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSpAQ-0005AC-TW; Thu, 07 Nov 2019 21:18:10 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSpAN-000598-QD for linux-arm-kernel@lists.infradead.org; Thu, 07 Nov 2019 21:18:09 +0000 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA5DC2077C; Thu, 7 Nov 2019 21:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573161486; bh=+J4FAIKTXaaTMUjiB9JwExcwXekKFRbj/8/L2DEZGfA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=gDEqAWSa5ZZIbcdBqNLxXP5Bq9FiF+tJfk5J7VKwv0fHvTOnAkwdeMMxvwyMmrE1u M1soAbjwF54DNbKn+WpoBNaHdPDxHjCz7Zfmdng1PWtQW/HA03X/dNziBxwPOkPXG+ jxicxYHMDkodzwlwUgPlwUTwRQhvsAdsHL37JoII= Date: Thu, 7 Nov 2019 15:18:01 -0600 From: Bjorn Helgaas To: Olof Johansson , Lorenzo Pieralisi Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree Message-ID: <20191107211801.GA107543@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191107_131807_870065_B0D1BD54 X-CRM114-Status: GOOD ( 12.30 ) 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: Stephen Rothwell , Arnd Bergmann , Xiaowei Bao , Shawn Guo , Hou Zhiqiang , Linux Kernel Mailing List , Linux Next Mailing List , Fabio Estevam , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Nov 07, 2019 at 10:27:20AM -0800, Olof Johansson wrote: > On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the pci tree got a conflict in: > > > > arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > > > > between commit: > > > > 68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC") > > > > from the arm-soc tree and commit: > > > > 8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes") > > Bjorn, we ask that driver subsystem maintainers don't pick up DT > changes since it causes conflicts like these. > > Is it easy for you to drop this patch, or are we stuck with it? > Ideally it should never have been sent to you in the first place. :( Lorenzo, is it feasible for you to drop it from your pci/layerscape branch and repush it? If so, I can redo the merge into my "next" branch. Bjorn _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel