From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thierry Reding <thierry.reding@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dave Airlie <airlied@linux•ie>
Subject: linux-next: rebase of the drm-panel tree
Date: Fri, 18 Dec 2015 09:17:29 +1100 [thread overview]
Message-ID: <20151218091729.1e923834@canb.auug.org.au> (raw)
Hi Thierry,
I noticed that you have rebased the drm-panel tree today. Unfortunately,
Dave merged the previous version of your tree :-(
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.
Please either go back to the old version, or just rebase what you have
now on top of Dave's drm tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-17 22:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 22:17 Stephen Rothwell [this message]
2015-12-18 6:44 ` linux-next: rebase of the drm-panel tree Thierry Reding
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=20151218091729.1e923834@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thierry.reding@gmail$(echo .)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