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=-7.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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 8F77EC433DB for ; Thu, 18 Mar 2021 06:52:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 32D9D64F2A for ; Thu, 18 Mar 2021 06:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbhCRGv7 (ORCPT ); Thu, 18 Mar 2021 02:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbhCRGvg (ORCPT ); Thu, 18 Mar 2021 02:51:36 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E877C06174A; Wed, 17 Mar 2021 23:51:34 -0700 (PDT) Received: from [192.168.1.111] (91-157-208-71.elisa-laajakaista.fi [91.157.208.71]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6DD4C899; Thu, 18 Mar 2021 07:51:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1616050291; bh=OLav/Aa/2rCDA1aYy29j1rYQIHc2mBshyrRFKtSkDtE=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=ETXnBrAYqVNh0HydaYQCo69fuMrN/pWxZ1Badqh9lWYbe9D/ou4JES4ttn4gK4qD7 rzY4qYeOpoWx31O+CJc74W5n8yWgPP0eOxozWM/3/C4RKwfzJdIcumNPePPMfgEodb 15IT8KwzdACVQk2xjrm5CDb6QuLgyFw2bWUbOIXw= Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree To: Stephen Rothwell , Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Junlin Yang , Linux Kernel Mailing List , Linux Next Mailing List , Menglong Dong References: <20210318120221.6dc8f33b@canb.auug.org.au> From: Tomi Valkeinen Message-ID: Date: Thu, 18 Mar 2021 08:51:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210318120221.6dc8f33b@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 18/03/2021 03:02, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/omapdrm/dss/dsi.c > > between commit: > > 690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero") > > from the drm-misc-fixes tree and commit: > > bbd13d6a7b2e ("drm/omap: dsi: fix unreachable code in dsi_vc_send_short()") > > from the drm tree. > > I fixed it up (these do basically the same thing, so I used the former > 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. Yes, I messed that up. I accidentally merged a fix to drm-misc-fixes, but almost similar fix was already in drm-misc-next. Sorry about that. Tomi