From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 07F12C433F5
	for <linux-next@archiver.kernel.org>; Wed, 23 Feb 2022 14:47:00 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S241699AbiBWOr0 (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Wed, 23 Feb 2022 09:47:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36974 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229893AbiBWOrZ (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Wed, 23 Feb 2022 09:47:25 -0500
Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A3DC3E5E8;
        Wed, 23 Feb 2022 06:46:57 -0800 (PST)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by ams.source.kernel.org (Postfix) with ESMTPS id 054F1B81FEA;
        Wed, 23 Feb 2022 14:46:56 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 868AEC340E7;
        Wed, 23 Feb 2022 14:46:52 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=k20201202; t=1645627614;
        bh=vpgwV1R5ym8F2CoToh9UIP31zXnshBp9Dq+OGFK5Z/8=;
        h=From:To:Cc:Subject:Date:From;
        b=gVyUDvCICsCNnrnMNypi1UPFXpITuN6dKZLPYItiHFpSIYVAZvQgT35cM8c7++MDY
         Tqxh+st74Bskw7JxPGjXIgyH4k/R8vT4DXEiBnszZsJP+6/A/C0c1wA5iGfjma9Avv
         AGS6tuwRMd5P/dLtpMfOxT1SWmwueOPS56sL8vyEaLVFtmKOwhaiRajSLG1Ias7HAG
         7aMpcokII15HeIXgTdftXUKnDZUfiHJo+77l0F3v7JMHIbH0usc+pv4tDvSLsUk+Ic
         cnFH/gEzrsPXSeKACOClrH5Ztx6roDEZI+W6CLYbYzKN15Wz3nOCKOkpkUQIi5NYMD
         KcuXxTvucLfvg==
From:   broonie@kernel.org
To:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
        =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= 
        <ville.syrjala@linux.intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date:   Wed, 23 Feb 2022 14:46:49 +0000
Message-Id: <20220223144649.254884-1-broonie@kernel.org>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_bw.c

between commit:

  ec663bca9128f ("drm/i915: Fix bw atomic check when switching between SAGV vs. no SAGV")

from the drm-intel-fixes tree and commit:

  6d8ebef53c2cc ("drm/i915: Extract intel_bw_check_data_rate()")

from the drm-intel 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.

(took the drm-intel version)