From patchwork Mon Dec 16 00:46:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11293279 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78865139A for ; Mon, 16 Dec 2019 00:46:21 +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 557EF24689 for ; Mon, 16 Dec 2019 00:46:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="X2uSaKKP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 557EF24689 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au 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 337936E185; Mon, 16 Dec 2019 00:46:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED6DD6E185; Mon, 16 Dec 2019 00:46:16 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47bjJ55jptz9sPT; Mon, 16 Dec 2019 11:46:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1576457174; bh=UxPIgZrYv0zF0/z/QGfijrsRDlv9g3XeuR8qlLwB+dY=; h=Date:From:To:Cc:Subject:From; b=X2uSaKKPAv12JWHQBdP8IbB79Nk0UEUBrQpUGun5bWj9fWwXh2MbqSULOle52Cr2o AnJKsZFr1okzVOkrYOQiUqhjJ607l+Upia6/2i5IYceZWbQ/eolGCxJAET3Z3VcblH DEI9uRHHYVHrQok0vFLaEnJC19vH69c92SWQJQPZGCT0FwuofEizufULmpJ/tuY/+k dmZIiBIv+ODdwz8wT1zBIQqyCFReBCVTgYbYJiaq6LgXA6u52G0bYEIFJP/A/qMooa cHVpSPXjg8zpYzijzvqG0UsqO4Gviiln13hfLLYcr4JzE4J1FBVu7Vnx6QC+PR/p1n RYnrBWUkPSCcA== Date: Mon, 16 Dec 2019 11:46:12 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20191216114612.75915893@canb.auug.org.au> MIME-Version: 1.0 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: Linux Next Mailing List , Sean Paul , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_dp_mst_topology.c between commit: 14692a3637d4 ("drm/dp_mst: Add probe_lock") 3f9b3f02dda5 ("drm/dp_mst: Protect drm_dp_mst_port members with locking") 6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming") from Linus' tree and commits: f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when initializing") from the drm-misc tree. I fixed it up (see below) 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. diff --cc drivers/gpu/drm/drm_dp_mst_topology.c index 273dd80fabf3,1770754bcd4a..000000000000 --- a/drivers/gpu/drm/drm_dp_mst_topology.c