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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS 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 E9355C6778F for ; Fri, 27 Jul 2018 07:57:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F97C20862 for ; Fri, 27 Jul 2018 07:57:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F97C20862 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de 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 S1730120AbeG0JSd (ORCPT ); Fri, 27 Jul 2018 05:18:33 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:46717 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729536AbeG0JSc (ORCPT ); Fri, 27 Jul 2018 05:18:32 -0400 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtp (Exim 4.89) (envelope-from ) id 1fixdA-0000hX-2w; Fri, 27 Jul 2018 09:57:44 +0200 Message-ID: <1532678263.4694.4.camel@pengutronix.de> Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree From: Philipp Zabel To: Stephen Rothwell , Dave Airlie , DRI , Mauro Carvalho Chehab Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Steve Longerbeam Date: Fri, 27 Jul 2018 09:57:43 +0200 In-Reply-To: <20180727143640.4dc3fa54@canb.auug.org.au> References: <20180727143640.4dc3fa54@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2018-07-27 at 14:36 +1000, Stephen Rothwell wrote: > 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) This is correct. > 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. Steve had pointed out a valid issue with 343b23a7c6b6, I didn't expect this patch to get picked up. I should have mentioned on linux-media that I had submitted the fixed version for inclusion in drm-next. regards Philipp