From: Jani Nikula <jani.nikula@linux.intel.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
linux-kernel@vger.kernel.org,
DRI <dri-devel@lists.freedesktop.org>,
Chen-Yu Tsai <wens@csie.org>,
linux-next@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the sunxi tree
Date: Wed, 08 Mar 2017 10:26:54 +0200 [thread overview]
Message-ID: <878togjhrl.fsf@intel.com> (raw)
In-Reply-To: <20170307213940.kcaedlhiua2r4lsq@lukather>
On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> I just rebased my tree on top of the latest drm-misc tag
> (drm-misc-next-2017-03-06). It should compile, and not have merge
> conflicts anymore.
Conflicts happen. Rebasing should not be the standard operating
procedure for fixing them.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-03-08 8:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-07 0:10 linux-next: build failure after merge of the sunxi tree Stephen Rothwell
2017-03-07 21:39 ` Maxime Ripard
2017-03-08 8:26 ` Jani Nikula [this message]
2017-03-08 9:49 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2025-04-28 11:38 Stephen Rothwell
2021-11-22 23:27 Stephen Rothwell
2021-11-23 9:31 ` Maxime Ripard
2020-10-26 23:42 Stephen Rothwell
2020-10-27 15:28 ` Maxime Ripard
2020-01-06 22:20 Stephen Rothwell
2020-01-06 22:27 ` Maxime Ripard
2018-06-27 22:42 Stephen Rothwell
2018-03-07 22:35 Stephen Rothwell
2018-03-08 2:37 ` Emmanuel Vadot
2018-03-08 3:19 ` Chen-Yu Tsai
2017-10-31 20:43 Stephen Rothwell
2017-11-01 7:57 ` Corentin Labbe
2016-10-25 0:26 Stephen Rothwell
2016-10-25 10:41 ` Maxime Ripard
2016-02-04 23:14 Stephen Rothwell
2016-02-05 9:10 ` Maxime Ripard
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=878togjhrl.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--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=maxime.ripard@free-electrons.com \
--cc=sfr@canb.auug.org.au \
--cc=wens@csie.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).