From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Ville Syrjälä" <ville.syrjala@linux•intel.com>
Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date: Tue, 29 Sep 2015 11:26:21 +1000 [thread overview]
Message-ID: <20150929112621.520b7003@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/intel_audio.c
between commit:
b8abe859c9d6 ("drm/i915: Always call the adjusted mode 'adjusted_mode'")
from the drm-intel tree and commit:
9e5a3b529e84 ("drm: Remove the 'mode' argument from drm_select_eld()")
from the drm-misc tree.
I fixed it up (I used the drm-misc tree version) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-09-29 1:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 1:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-15 2:04 linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell
2015-12-14 1:06 Stephen Rothwell
2016-04-27 2:32 Stephen Rothwell
2016-05-03 3:24 Stephen Rothwell
2016-05-03 7:54 ` Daniel Vetter
2016-10-23 23:59 Stephen Rothwell
2017-01-03 1:50 Stephen Rothwell
2017-01-03 1:59 Stephen Rothwell
2017-01-03 2:08 Stephen Rothwell
2017-01-03 2:14 Stephen Rothwell
2017-03-06 23:48 Stephen Rothwell
2017-05-23 2:00 Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-07-20 1:23 Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2019-01-16 1:27 Stephen Rothwell
2019-03-19 0:51 Stephen Rothwell
2019-05-22 23:53 Stephen Rothwell
2019-05-22 23:58 Stephen Rothwell
2019-08-20 2:19 Stephen Rothwell
2020-04-15 1:52 Stephen Rothwell
2020-09-22 3:34 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=20150929112621.520b7003@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ville.syrjala@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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