From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree Date: Fri, 27 Jul 2018 07:32:42 -0300 Message-ID: <20180727073242.4b18aa05@coco.lan> References: <20180727143640.4dc3fa54@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180727143640.4dc3fa54@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell Cc: Steve Longerbeam , Dave Airlie , Linux Kernel Mailing List , DRI , Linux-Next Mailing List , Mauro Carvalho Chehab List-Id: linux-next.vger.kernel.org RW0gRnJpLCAyNyBKdWwgMjAxOCAxNDozNjo0MCArMTAwMApTdGVwaGVuIFJvdGh3ZWxsIDxzZnJA Y2FuYi5hdXVnLm9yZy5hdT4gZXNjcmV2ZXU6Cgo+IEhpIGFsbCwKPiAKPiBUb2RheSdzIGxpbnV4 LW5leHQgbWVyZ2Ugb2YgdGhlIGRybSB0cmVlIGdvdCBhIGNvbmZsaWN0IGluOgo+IAo+ICAgZHJp dmVycy9ncHUvaXB1LXYzL2lwdS1jcG1lbS5jCj4gCj4gYmV0d2VlbiBjb21taXQ6Cj4gCj4gICAz NDNiMjNhN2M2YjYgKCJtZWRpYTogZ3B1OiBpcHUtdjM6IEFsbG93IG5lZ2F0aXZlIG9mZnNldHMg Zm9yIGludGVybGFjZWQgc2Nhbm5pbmciKQo+IAo+IGZyb20gdGhlIHY0bC1kdmIgdHJlZSBhbmQg Y29tbWl0Ogo+IAo+ICAgNGUzYzVkN2UwNWJlICgiZ3B1OiBpcHUtdjM6IEFsbG93IG5lZ2F0aXZl IG9mZnNldHMgZm9yIGludGVybGFjZWQgc2Nhbm5pbmciKQo+IAo+IGZyb20gdGhlIGRybSB0cmVl Lgo+IAo+IEkgZml4ZWQgaXQgdXAgKEkganVzdCB1c2VkIHRoZSBkcm0gdHJlZSB2ZXJzaW9uKSBh bmQgY2FuIGNhcnJ5IHRoZSBmaXgKPiBhcyBuZWNlc3NhcnkuIFRoaXMgaXMgbm93IGZpeGVkIGFz IGZhciBhcyBsaW51eC1uZXh0IGlzIGNvbmNlcm5lZCwgYnV0Cj4gYW55IG5vbiB0cml2aWFsIGNv bmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVkIHRvIHlvdXIgdXBzdHJlYW0gbWFpbnRhaW5lcgo+ IHdoZW4geW91ciB0cmVlIGlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3 YW50IHRvIGNvbnNpZGVyCj4gY29vcGVyYXRpbmcgd2l0aCB0aGUgbWFpbnRhaW5lciBvZiB0aGUg Y29uZmxpY3RpbmcgdHJlZSB0byBtaW5pbWlzZSBhbnkKPiBwYXJ0aWN1bGFybHkgY29tcGxleCBj b25mbGljdHMuCgpNeSBtaXN0YWtlLiBOb3Qgc3VyZSB3aHkgbWVkaWEgTUwgd2FzIGMvYyBvbiB0 aGlzIHBhdGNoLiBBcyB0aGUgYXV0aG9yCmlzIGFuIHVzdWFsIG1lZGlhIGNvbnRyaWJ1dG9yIGFu ZCB3ZSBoYXZlIGFuIElQVTMgZHJpdmVyIHRoYXQgaGFzIGJlaW5nCnRha2luZyBzb21lIGRpc2N1 c3Npb25zIHRob3NlIGRheXMsIEkgZW5kZWQgYnkgbWVyZ2luZyBpdCB3aXRob3V0Cm5vdGljaW5n IHRoYXQgaXQgd2FzIGZvciB0aGUgZ3B1IGRyaXZlci4KCkknbGwgcmVtb3ZlIGl0IGZyb20gbXkg dHJlZSBpbiBvcmRlciB0byBhdm9pZCBjb25mbGljdHMuCgpUaGFua3MsCk1hdXJvCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= 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=-0.9 required=3.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,SPF_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 1CC5EC67790 for ; Fri, 27 Jul 2018 10:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A66CF2089A for ; Fri, 27 Jul 2018 10:32:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="GSpaDYmn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A66CF2089A 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-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbeG0LyK (ORCPT ); Fri, 27 Jul 2018 07:54:10 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:50968 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730120AbeG0LyJ (ORCPT ); Fri, 27 Jul 2018 07:54:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TZdq/khbKx87tq+zY1V5s7m8egq8T6gFVIiGCEyQXEU=; b=GSpaDYmndTe4VWslbxK8z04g/ i8gw7Sl6eH20OQbaE8omTfpplXOgAzEzZnw98gwlFninRcjmQjO43XTi9B4YN3llVE8aLVS0+q/UN Y0/0doloIfuzkDzZmp1TPxNxscOWxYm0AeYk+wpFb4R27N1Omjp8znkTMg90FqWsIMysIxpreGcAJ yqaAnwSCmwEgcCANO2JAvL9DSoHF8hFw1hIy8nHMFCEs7+pR+Eitb2zoJ2wDoZWquFN0KXOJzNsPs EwZvMsM2u8GwdsmFFusq/vwxQepeqXV1VBWtUNl8oqU8YuFy9lRiRdj8mHspqj3krSEKIj/RBY4an majpSStdw==; Received: from 179.176.120.227.dynamic.adsl.gvt.net.br ([179.176.120.227] helo=coco.lan) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fj03E-0007jt-5F; Fri, 27 Jul 2018 10:32:48 +0000 Date: Fri, 27 Jul 2018 07:32:42 -0300 From: Mauro Carvalho Chehab To: Stephen Rothwell Cc: Dave Airlie , DRI , Mauro Carvalho Chehab , Linux-Next Mailing List , Linux Kernel Mailing List , Philipp Zabel , Steve Longerbeam Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree Message-ID: <20180727073242.4b18aa05@coco.lan> In-Reply-To: <20180727143640.4dc3fa54@canb.auug.org.au> References: <20180727143640.4dc3fa54@canb.auug.org.au> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, 27 Jul 2018 14:36:40 +1000 Stephen Rothwell escreveu: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/ipu-v3/ipu-cpmem.c > > between commit: > > 343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced scanning") > > from the v4l-dvb tree and commit: > > 4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scanning") > > from the drm tree. > > I fixed it up (I just used the drm tree version) 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. My mistake. Not sure why media ML was c/c on this patch. As the author is an usual media contributor and we have an IPU3 driver that has being taking some discussions those days, I ended by merging it without noticing that it was for the gpu driver. I'll remove it from my tree in order to avoid conflicts. Thanks, Mauro