linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: Jani Nikula <jani.nikula@intel.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Wed, 24 Aug 2016 11:32:26 +1000	[thread overview]
Message-ID: <20160824113226.3fbcc285@canb.auug.org.au> (raw)

Hi all,

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

  drivers/gpu/drm/i915/intel_drv.h

between commit:

  f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs")
  (which is a chery-pick of commit 656d1b89e5ff from the drm-intel tree)

from the drm-intel-fixes tree and commit:

  62e0fb880123 ("drm/i915/skl: Update plane watermarks atomically during plane updates")

from the drm-intel tree.

I fixed it up (I just used the drm-intel tree version) 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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2016-08-24  1:32 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-24  1:32 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-02-25 17:08 linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree broonie
2022-02-23 14:46 broonie
2022-02-02 23:59 Stephen Rothwell
2021-08-02 15:18 Mark Brown
2020-06-30  1:52 Stephen Rothwell
2020-07-06  1:51 ` Stephen Rothwell
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-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=20160824113226.3fbcc285@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).