From patchwork Sun Sep 15 17:20:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 173810 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp2628321ilq; Sun, 15 Sep 2019 10:21:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqz2VwGI6ic8LoS4YS1djs/m9YYN+RRw/WGwfzg5LXhLI+ti67nGgAR3H2QwVgga72RvomxA X-Received: by 2002:a17:906:fc20:: with SMTP id ov32mr11601657ejb.22.1568568066474; Sun, 15 Sep 2019 10:21:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568568066; cv=none; d=google.com; s=arc-20160816; b=C+C1dHddAnFoG1cAN3aaACpTJ7jttE6HeOUChyORA4msc5UAkNHbXiHUwp693+HsoL b7f5lkYe9EvPurH6Aka0fkHjCmmz9sBGyIr2C1euXU5kWv8kNDTxV8nvt9JiCQPb646q mi96M4NP8X7zz1mNF41k+a6sHK+5xXX2mVcwlIqyM/O+2LfpzvuU6yyzuSlklyFl3qza QzS5dgec9SHgWHR7nZuu0OJvXo9QY3de4HTHXL33iBOSLJ4gbETtnyTN6oK91GDfe3aO 7AYbGSghmESuqVBWUsUOBzuUUK/CkyWmiJaKY789eDrLLNhEyIL1XRP6lol3Vm5VrVTn 2+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=Vb3RI5wa2Xs1UyLdtQk1jJC3O0fNkUaE7+ZqTExFNVA=; b=soP6lMjJGA0oJ70Z8SZiQktswJ6mBI4I1qc+qcUloowr/+FROl8ZizQLGPYKh1MPHr NjUooMZAC15UN7khiPNvZVqIXdPPwkSz/f20iXEXa9YwuxrdQ3eSzLuxX7bUds9wJCvR RNPMs94+A4rmDsi2I1VT2vT90j7VLqc4QsBEMLJ2m4HpJr6O8KOq53upX3LdQq3FiXY9 S2GMiDF5r3qybJXBkQNXdHcMRfLxq1Wmb2EF7+V7vivSY2KyJrh1Lz4JLqf8Nx0eAdjE KIAeX307XkdAgkanG1aVJdX4r/QhrA4fDFFM3uwl8w5mERx/b9q2WofeTvIejIBf6omu oVfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=v4Ad0REo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a12si18334781ejs.227.2019.09.15.10.21.06; Sun, 15 Sep 2019 10:21:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=v4Ad0REo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726665AbfIORUU (ORCPT + 27 others); Sun, 15 Sep 2019 13:20:20 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:60124 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbfIORUT (ORCPT ); Sun, 15 Sep 2019 13:20:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender: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-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Vb3RI5wa2Xs1UyLdtQk1jJC3O0fNkUaE7+ZqTExFNVA=; b=v4Ad0REoWbhWxGmd6MIb7sQAI aXPimFPOkqPJbgNgLDYUlm1D7X9QHbKlyZ6In9D+cA+MrbQR+zLoUIwuz47wWig1tFEunATt5In+l 7VFY70dwAfTJ1GvKB6qVjM6u5Qkeqnx1Y9ksVYEDD8npPjIDyOTHrDlqj/Uat8Bh2MdV0=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9YC9-0000jR-8J; Sun, 15 Sep 2019 17:20:17 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 4C673274154D; Sun, 15 Sep 2019 18:20:16 +0100 (BST) Date: Sun, 15 Sep 2019 18:20:16 +0100 From: Mark Brown To: Ralf Baechle , James Hogan , Arnd Bergmann Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the mips tree with the arm-soc tree Message-ID: <20190915172016.GA4352@sirena.co.uk> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the mips tree got a conflict in: drivers/video/fbdev/Makefile between commit: c7b46e0c33c5946 ("fbdev: remove w90x900/nuc900 platform drivers") from the arm-soc tree and commit: e305bff3a706f58 ("video/fbdev: Drop JZ4740 driver") from the mips 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 --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index aab7155884eaa..aa6352798cf4e 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -116,7 +116,6 @@ obj-y += omap2/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ -obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o obj-$(CONFIG_FB_OPENCORES) += ocfb.o