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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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 25B58C433E2 for ; Tue, 8 Sep 2020 16:55:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAC07207DE for ; Tue, 8 Sep 2020 16:55:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FaiKCfdB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731931AbgIHQzG (ORCPT ); Tue, 8 Sep 2020 12:55:06 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23205 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731968AbgIHQsG (ORCPT ); Tue, 8 Sep 2020 12:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599583682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=FaiKCfdB8+U66neeWsffP/LUV0GoQtx+Cy1IXNrbabf5j2Ukf6E+ySYzCTCgbItvaCgN+7 T8BEIHHxpjZDN/IVIejmPgJSLMH2fSCnk9XL6QqStg05DQQTcALlN0y3ipFKHy/FKYvqVo l8y8MA2HTwN/4Uv+VVYEh5yHNXm5VU8= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-XRUQI1pMNHuYOvpsHNAFYQ-1; Tue, 08 Sep 2020 09:20:27 -0400 X-MC-Unique: XRUQI1pMNHuYOvpsHNAFYQ-1 Received: by mail-ej1-f72.google.com with SMTP id gt18so6654466ejb.16 for ; Tue, 08 Sep 2020 06:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=CFtshIBx7OlaLgWfa+KTC9t1a1xZbwIYF2VdwYt53sgBMw0+A24LRHfYODryzZdJ1J 4JkyivphuW5tnav7Mo2/+ZQLfOfROEC71W33iysIFHTTLb95V99CmpzhnYrsjGPYnwtn 0cQnUN5x63iDEoYhWY6pNPp4Z1mPRuTaWffeG5tM2bO+WwktqLDw7pE3SFa1ZXotDp6B Q8h4mejz1HwZgYFf6vfNEn8tEwwrN4LuHxrSgM2F6Zk/v1XMD70DE4qkpdbA+WIN9UWN Wghv3KpHaaSCO+5EG88wtYRn/tr6MGKJ0spd7bCkuF+qXoyX1jWmaYZA8oyo1mS5ckJ8 eUTw== X-Gm-Message-State: AOAM530a6KpPVaexSdIrWzc7di/0M/kHEA+6aKas4PDIBDGLGFjIPOwM OF+WywL2UEqBWluuDw2RuH8CsQ3XoPnsCJiiUKShZXa1OvpPc2QbymHg+s0c2s/uoJqdT0csQMc Kvd30Y9K05mN4/rl7dYaGf2p6 X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729557edr.13.1599571225564; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJSCXKpUVVYMUY6y6pGIlWBQF6oylam73BShkdtH0Ngf5e1fkNihiTDrhP7Zi2Gs3qSlHKgQ== X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729530edr.13.1599571225337; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id n11sm14190638ejs.38.2020.09.08.06.20.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 06:20:24 -0700 (PDT) Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree To: Stephen Rothwell Cc: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Guru Das Srinagesh , Thierry Reding , Linux Next Mailing List , Linux Kernel Mailing List References: <20200908140022.67dd3801@canb.auug.org.au> <20200908210449.1a4f8e52@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 15:20:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908210449.1a4f8e52@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 9/8/20 1:04 PM, Stephen Rothwell wrote: > Hi Hans, > > On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: >> >> On 9/8/20 6:00 AM, Stephen Rothwell wrote: >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_panel.c >>> >>> between commit: >>> >>> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > This should have been > > 899c537c25f9 ("drm/i915: Use 64-bit division macro") Yes that makes more sense. >>> from Linus' tree and commit: >>> >>> 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") >> >> That doesn't sound correct, those are both commits from the drm-intel tree. >> >>> from the drm-intel tree. >>> >>> I fixed it up (I just used the latter) >> >> Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: >> >> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") >> >> Is the right thing to do, the problem is a difference in a line which gets >> removed in that commit. > > Which is what I actually did, I guess :-) Yes, looks good. > Sorry about that. No problem and thank you for all the work you do on -next. Regards, Hans 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=-6.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 AFC21C433E2 for ; Tue, 8 Sep 2020 13:20:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F9BC206D4 for ; Tue, 8 Sep 2020 13:20:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VVhCXbto" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F9BC206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B6B56E823; Tue, 8 Sep 2020 13:20:31 +0000 (UTC) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2A9A6E029 for ; Tue, 8 Sep 2020 13:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599571228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=VVhCXbtogALha8HgF/EJvCIEP9bsyIT6TZjXycVfa64aMJAzcohRF5XT2gdXC6QxQGJRTP Sqh//fLGBt8dRs1jPvLaxzgrlC51nSszh0N2bjzZ/3Z6STs40UfW6+m2CfqEkz38hBApUo GXS2NuuqfbGSARk4yyZzK6K0PZOueqw= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-RkS7nkdjN4SEa8vZ4shUHg-1; Tue, 08 Sep 2020 09:20:27 -0400 X-MC-Unique: RkS7nkdjN4SEa8vZ4shUHg-1 Received: by mail-ed1-f70.google.com with SMTP id n25so6182802edr.13 for ; Tue, 08 Sep 2020 06:20:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=jx1tu8HGNqiY3pLltMglAYSdY7eqJeQRlgJg5ZmWmiTY5zPdSj9tBjWRbyec/p4CVe 0cJMZ7HzmBcXtN1pdpWt22nMzoPOLKDJw70SMO77Yd/otsY5tXt5x8cTXEz3JYPFl1nU mu0IyekyGMM8O8q3LKylFXXolDLcBa/zpbr9S+IEYTLg2HZMBnHWbiPywFBl6+OwZVFS 8P/ZMX8wba2S9eJQjn2K++vaYOp1D5JFlnotglGK6hUPGpTewTJH0R94mPTCQnSek+ly YRBow+dRKD7DvsAcVaRmjlHaVhMax2flmVUQr26/lXWs7zc8UbZZzuaPo/3KUGXF6YsM IYgQ== X-Gm-Message-State: AOAM533Vjd7mu23wP0zw5ZvL1YtQlEIZKiIBjuge9q9l7cex+Uc1fk+M CvJxE6tSqDC05cvT7EznwFY9wKGLEunASKgnqVBr6W2psxsBVEbdVUFVysttkNCk8uqCwrwsrv+ wM3hhNB857N4wtmc3TjILdctuvarP X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729545edr.13.1599571225487; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJSCXKpUVVYMUY6y6pGIlWBQF6oylam73BShkdtH0Ngf5e1fkNihiTDrhP7Zi2Gs3qSlHKgQ== X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729530edr.13.1599571225337; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id n11sm14190638ejs.38.2020.09.08.06.20.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 06:20:24 -0700 (PDT) Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree To: Stephen Rothwell References: <20200908140022.67dd3801@canb.auug.org.au> <20200908210449.1a4f8e52@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 15:20:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908210449.1a4f8e52@canb.auug.org.au> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guru Das Srinagesh , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thierry Reding , Rodrigo Vivi Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On 9/8/20 1:04 PM, Stephen Rothwell wrote: > Hi Hans, > > On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: >> >> On 9/8/20 6:00 AM, Stephen Rothwell wrote: >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_panel.c >>> >>> between commit: >>> >>> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > This should have been > > 899c537c25f9 ("drm/i915: Use 64-bit division macro") Yes that makes more sense. >>> from Linus' tree and commit: >>> >>> 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") >> >> That doesn't sound correct, those are both commits from the drm-intel tree. >> >>> from the drm-intel tree. >>> >>> I fixed it up (I just used the latter) >> >> Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: >> >> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") >> >> Is the right thing to do, the problem is a difference in a line which gets >> removed in that commit. > > Which is what I actually did, I guess :-) Yes, looks good. > Sorry about that. No problem and thank you for all the work you do on -next. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-6.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 69373C433E2 for ; Tue, 8 Sep 2020 13:20:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D64B206D4 for ; Tue, 8 Sep 2020 13:20:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VVhCXbto" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D64B206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FD486E029; Tue, 8 Sep 2020 13:20:30 +0000 (UTC) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id 599E16E029 for ; Tue, 8 Sep 2020 13:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599571228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=VVhCXbtogALha8HgF/EJvCIEP9bsyIT6TZjXycVfa64aMJAzcohRF5XT2gdXC6QxQGJRTP Sqh//fLGBt8dRs1jPvLaxzgrlC51nSszh0N2bjzZ/3Z6STs40UfW6+m2CfqEkz38hBApUo GXS2NuuqfbGSARk4yyZzK6K0PZOueqw= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-mJPFcnypMOCxj1rW7UJYxg-1; Tue, 08 Sep 2020 09:20:26 -0400 X-MC-Unique: mJPFcnypMOCxj1rW7UJYxg-1 Received: by mail-ed1-f69.google.com with SMTP id b12so6194954edw.15 for ; Tue, 08 Sep 2020 06:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kk/MzQpl2YW+BRjUs+jKB6CtH3juIQy3EW0uS3+0BVs=; b=A4yNgeXZNslu2c0qpC3os+1PWy7t173N6iilX3kP/IieDw0IEnngpdjisOL2Wg4Ktg VjF/GxbzN4Kd/rmKDt+ll4ff7qvoroMDfbMlPeCiWeGghFzkk8OpTRVPQ3rGtHzkQ7P3 3NoK1+5nEarG9TKkHT651L5zZ46Kep82/mqFNpqDTvTdZqn4X/YkNK1Rd4sgA8UKgLNq JbwBRupb5MW7O+ZvhBKaoS+A26/OORBUXvFcrDqKC8ZeOmYDh7GTFTxRMc2lkdGJEr6e WREj18MerOMlAb1Y/zmeRfljdffAF2lKGJ32kjRHTxzIY+vNDl6Mskmsm9F2zSNkRH6R Pxpg== X-Gm-Message-State: AOAM532TDGaqHIWFYfy8ovNVzH2Mi0kLzCIgNlOrl/JTh2sSNoWEOphk TmWSBFsRG74DMeUDd+w1IwgC1KhYPIATXol0RTfxnONEuiAi53weEzKRFVyvpGAAMS6fV6LkiRM exe9trq7Z9O8Xw+OJqpa7RejtxNMp X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729574edr.13.1599571225752; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJSCXKpUVVYMUY6y6pGIlWBQF6oylam73BShkdtH0Ngf5e1fkNihiTDrhP7Zi2Gs3qSlHKgQ== X-Received: by 2002:aa7:d697:: with SMTP id d23mr27729530edr.13.1599571225337; Tue, 08 Sep 2020 06:20:25 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id n11sm14190638ejs.38.2020.09.08.06.20.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 06:20:24 -0700 (PDT) To: Stephen Rothwell References: <20200908140022.67dd3801@canb.auug.org.au> <20200908210449.1a4f8e52@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 15:20:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908210449.1a4f8e52@canb.auug.org.au> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Language: en-US Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guru Das Srinagesh , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi, On 9/8/20 1:04 PM, Stephen Rothwell wrote: > Hi Hans, > > On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: >> >> On 9/8/20 6:00 AM, Stephen Rothwell wrote: >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_panel.c >>> >>> between commit: >>> >>> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > This should have been > > 899c537c25f9 ("drm/i915: Use 64-bit division macro") Yes that makes more sense. >>> from Linus' tree and commit: >>> >>> 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") >> >> That doesn't sound correct, those are both commits from the drm-intel tree. >> >>> from the drm-intel tree. >>> >>> I fixed it up (I just used the latter) >> >> Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: >> >> f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") >> >> Is the right thing to do, the problem is a difference in a line which gets >> removed in that commit. > > Which is what I actually did, I guess :-) Yes, looks good. > Sorry about that. No problem and thank you for all the work you do on -next. Regards, Hans _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx