From: Olof Johansson <olof@lixom.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Dave Airlie" <airlied@linux.ie>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-next <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 22 Jan 2014 17:21:28 -0800 [thread overview]
Message-ID: <CAOesGMgtavy=gSJQeqqxQFXgSwKGekU2=vwnN2o2TeWhG0bktg@mail.gmail.com> (raw)
In-Reply-To: <CAKMK7uF+p96YtDo3NG4nBV5S5gYXk55p5KUOxsb+PMY+MH_Zyw@mail.gmail.com>
On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Hi Stephen,
>
> On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-intel tree got a conflict in
>> drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
>> 'flags' from the caller to .get_scanout_position()") from the drm tree
>> and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from
>> the drm-intel tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary
>> (no action is required).
>
> Oops, this patch escaped - it's only for 3.15. I've shuffled my
> branches around now for the merge window so this should not pop up in
> your -next tree again until 3.15 starts.
I just bisected boot failures on x86 chromebooks with -next to this
merge commit. I'll take a look tomorrow morning and make sure they're
gone.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: Olof Johansson <olof@lixom.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 22 Jan 2014 17:21:28 -0800 [thread overview]
Message-ID: <CAOesGMgtavy=gSJQeqqxQFXgSwKGekU2=vwnN2o2TeWhG0bktg@mail.gmail.com> (raw)
In-Reply-To: <CAKMK7uF+p96YtDo3NG4nBV5S5gYXk55p5KUOxsb+PMY+MH_Zyw@mail.gmail.com>
On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Hi Stephen,
>
> On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-intel tree got a conflict in
>> drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
>> 'flags' from the caller to .get_scanout_position()") from the drm tree
>> and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from
>> the drm-intel tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary
>> (no action is required).
>
> Oops, this patch escaped - it's only for 3.15. I've shuffled my
> branches around now for the merge window so this should not pop up in
> your -next tree again until 3.15 starts.
I just bisected boot failures on x86 chromebooks with -next to this
merge commit. I'll take a look tomorrow morning and make sure they're
gone.
-Olof
next prev parent reply other threads:[~2014-01-23 1:21 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 3:04 linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2014-01-22 3:04 ` Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23 1:21 ` Olof Johansson [this message]
2014-01-23 1:21 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 0:09 Stephen Rothwell
2023-10-03 0:09 ` Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
2023-05-30 1:59 Stephen Rothwell
2023-05-30 1:59 ` Stephen Rothwell
2023-05-30 1:57 Stephen Rothwell
2023-05-30 1:57 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2023-01-24 23:42 ` Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-13 2:19 ` Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-09-12 1:46 ` Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-11 2:06 ` Stephen Rothwell
2022-02-09 0:55 Stephen Rothwell
2022-02-09 0:55 ` Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2021-04-01 2:13 Stephen Rothwell
2021-04-01 2:13 ` Stephen Rothwell
2021-03-17 3:08 Stephen Rothwell
2021-03-17 3:08 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 12:14 ` Thomas Zimmermann
2021-01-25 0:46 Stephen Rothwell
2021-01-25 0:46 ` Stephen Rothwell
2020-07-14 2:59 Stephen Rothwell
2020-07-14 2:59 ` Stephen Rothwell
2019-08-22 3:15 Stephen Rothwell
2019-02-06 0:42 Stephen Rothwell
2019-01-17 1:59 Stephen Rothwell
2019-01-17 1:59 ` Stephen Rothwell
2017-05-19 2:04 Stephen Rothwell
2016-09-07 3:59 Stephen Rothwell
2014-07-23 3:18 Stephen Rothwell
2014-07-23 3:18 ` Stephen Rothwell
2014-07-23 3:06 Stephen Rothwell
2014-07-23 3:06 ` Stephen Rothwell
2014-07-23 5:09 ` Daniel Vetter
2014-07-23 5:09 ` Daniel Vetter
2014-04-03 1:00 Stephen Rothwell
2014-04-03 1:00 ` Stephen Rothwell
2014-01-22 3:09 Stephen Rothwell
2014-01-22 3:09 ` Stephen Rothwell
2013-11-07 2:37 Stephen Rothwell
2013-11-07 2:37 ` Stephen Rothwell
2013-08-29 4:09 Stephen Rothwell
2013-08-29 4:09 ` Stephen Rothwell
2013-06-18 3:04 Stephen Rothwell
2013-06-18 3:04 ` Stephen Rothwell
2013-05-01 4:37 Stephen Rothwell
2013-05-01 8:08 ` Daniel Vetter
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='CAOesGMgtavy=gSJQeqqxQFXgSwKGekU2=vwnN2o2TeWhG0bktg@mail.gmail.com' \
--to=olof@lixom.net \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ville.syrjala@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.