From: Thierry Reding <thierry.reding@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Airlie <airlied@linux.ie>
Subject: Re: linux-next: rebase of the drm-panel tree
Date: Fri, 18 Dec 2015 07:44:31 +0100 [thread overview]
Message-ID: <20151218064431.GA8769@ulmo> (raw)
In-Reply-To: <20151218091729.1e923834@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 850 bytes --]
On Fri, Dec 18, 2015 at 09:17:29AM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> I noticed that you have rebased the drm-panel tree today. Unfortunately,
> Dave merged the previous version of your tree :-(
And I had hoped to have been fast enough. Sorry for the mess.
> So, now in linux-next today, we are going to have 2 copies of all theose
> patches, plus at least 2 of the patches have beenm changed in you new
> version so there will probably be conflicts.
Yes, there were two changes (in two patches) which moved device tree
bindings from a deprecated location to the new one.
> Please either go back to the old version, or just rebase what you have
> now on top of Dave's drm tree.
I'll revert to the old version and apply the changes as a separate patch
on top.
Again, sorry for the inconvenience.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-12-18 6:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 22:17 linux-next: rebase of the drm-panel tree Stephen Rothwell
2015-12-18 6:44 ` Thierry Reding [this message]
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=20151218064431.GA8769@ulmo \
--to=thierry.reding@gmail.com \
--cc=airlied@linux.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.