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.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 05BD9C54FC9 for ; Tue, 21 Apr 2020 06:10:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA4982076C for ; Tue, 21 Apr 2020 06:10:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="fRuulgzt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726600AbgDUGKl (ORCPT ); Tue, 21 Apr 2020 02:10:41 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:38348 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgDUGKk (ORCPT ); Tue, 21 Apr 2020 02:10:40 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 03L6AROO039864; Tue, 21 Apr 2020 01:10:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1587449427; bh=/Qm0nN975rNbEtln8d0XpXBdQQvlYJtmMjr4wru7glU=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=fRuulgzt4zXB8MqaH7y5qB/XhsahY0jTar48Gd1ed7BB33v0TkmF3voYiTHpsiNSc jCa/fXw1+F01OlUpokUcMdgpplxhBfm2akMNOKudjGzDdX2y4c9RGCifhGOuGOypp9 7SNI72VRLy99GRVqjdM/BXyV6f92Rxd+OmVnJDO4= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03L6ARKN129595; Tue, 21 Apr 2020 01:10:27 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Tue, 21 Apr 2020 01:10:27 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Tue, 21 Apr 2020 01:10:27 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03L6APCg037008; Tue, 21 Apr 2020 01:10:26 -0500 Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree To: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI CC: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Zimmermann References: <20200421115241.704f2fbf@canb.auug.org.au> From: Tomi Valkeinen Message-ID: Date: Tue, 21 Apr 2020 09:10:25 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200421115241.704f2fbf@canb.auug.org.au> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 21/04/2020 04:52, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc tree with the drm-misc-fixes tree > > drivers/gpu/drm/tidss/tidss_encoder.c > > between commit: > > 9da67433f64e ("drm/tidss: fix crash related to accessing freed memory") > > from the drm-misc-fixes tree and commit: > > b28ad7deb2f2 ("drm/tidss: Use simple encoder") > > from the drm-misc tree. > > I fixed it up (I just used the latter version of this file) and can We need to use "drm/tidss: fix crash related to accessing freed memory" version. > 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. I have fixed this with drm-misc's dim tool, so I presume the conflict goes away when drm-misc-fixes is merged to drm-fixes, and drm-fixes is then at some point merged to drm-misc-next. It was a bit bad timing with the "drm/tidss: Use simple encoder", which removes the plumbing I needed to implement the fix. So I effectively revert the "drm/tidss: Use simple encoder". Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki