Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
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 Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Colin Xu <colin.xu@intel.com>,
	Zhenyu Wang <zhenyuw@linux.intel.com>,
	Dave Airlie <airlied@linux.ie>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Tue, 30 Jun 2020 11:52:02 +1000
Message-ID: <20200630115202.04c39f9b@canb.auug.org.au> (raw)


[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

Hi all,

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

  drivers/gpu/drm/i915/gvt/handlers.c

between commit:

  fc1e3aa0337c ("drm/i915/gvt: Fix incorrect check of enabled bits in mask registers")

from the drm-intel-fixes tree and commit:

  5f4ae2704d59 ("drm/i915: Identify Cometlake platform")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
index fadd2adb8030,26cae4846c82..000000000000
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@@ -1731,8 -1734,9 +1734,9 @@@ static int ring_mode_mmio_write(struct 
  		return 0;
  	}
  
- 	if (IS_COFFEELAKE(vgpu->gvt->gt->i915) &&
+ 	if ((IS_COFFEELAKE(vgpu->gvt->gt->i915) ||
+ 	     IS_COMETLAKE(vgpu->gvt->gt->i915)) &&
 -	    data & _MASKED_BIT_ENABLE(2)) {
 +	    IS_MASKED_BITS_ENABLED(data, 2)) {
  		enter_failsafe_mode(vgpu, GVT_FAILSAFE_UNSUPPORTED_GUEST);
  		return 0;
  	}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-30  1:52 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-11  2:36 Stephen Rothwell
2020-03-20  1:57 ` Stephen Rothwell
2019-03-21 23:57 Stephen Rothwell
2019-03-31 22:59 ` Stephen Rothwell
2017-10-18  9:27 Mark Brown
2017-10-16 11:35 Mark Brown
2017-10-17  8:11 ` Arnd Bergmann
2017-10-17  8:30   ` Mark Brown
2017-10-12 18:44 Mark Brown
2017-10-12 18:36 Mark Brown
2017-06-08  3:07 Stephen Rothwell
2017-06-08  3:04 Stephen Rothwell
2017-03-21  0:37 Stephen Rothwell
2016-08-24  1:42 Stephen Rothwell
2016-08-24  1:32 Stephen Rothwell
2016-06-22  1:40 Stephen Rothwell
2015-11-18  0:30 Stephen Rothwell
2015-09-30  1:32 Stephen Rothwell
2015-09-24  1:25 Stephen Rothwell
2015-09-24  8:57 ` Jani Nikula
2015-09-24 11:52   ` Stephen Rothwell
2015-07-15  0:15 Stephen Rothwell
2015-07-14  2:11 Stephen Rothwell
2015-07-14  7:34 ` Daniel Vetter
2015-07-10  2:15 Stephen Rothwell
2015-07-10  2:08 Stephen Rothwell
2015-02-27  0:36 Stephen Rothwell
2015-02-26  0:15 Stephen Rothwell
2015-02-25  1:05 Stephen Rothwell
2015-01-09  2:06 Stephen Rothwell
2014-05-22  5:58 Stephen Rothwell
2014-04-30  2:37 Stephen Rothwell
2013-12-16  1:45 Stephen Rothwell
2013-12-02  1:04 Stephen Rothwell
2013-12-02  1:13 ` Stephen Rothwell
2013-09-25  2:00 Stephen Rothwell
2013-09-20  1:40 Stephen Rothwell
2013-07-26  3:14 Stephen Rothwell
2013-07-26  3:10 Stephen Rothwell
2013-07-18  2:07 Stephen Rothwell
2013-07-18  1:44 Stephen Rothwell
2013-07-16  2:05 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200630115202.04c39f9b@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=chris@chris-wilson.co.uk \
    --cc=colin.xu@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=zhenyuw@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git