Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1594931
| From | Jani Nikula <jani.nikula@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: build failure after merge of the sunxi tree |
| Date | 2017-03-08 09:30 +0100 |
| Message-ID | <tiF8S-3JU-17@gated-at.bofh.it> (permalink) |
| References | <tieV3-1UI-1@gated-at.bofh.it> <tiv9v-5b2-3@gated-at.bofh.it> |
| Organization | Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: build failure after merge of the sunxi tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-07 05:30 +0100
Re: linux-next: build failure after merge of the sunxi tree Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-03-07 22:50 +0100
Re: linux-next: build failure after merge of the sunxi tree Jani Nikula <jani.nikula@linux.intel.com> - 2017-03-08 09:30 +0100
Re: linux-next: build failure after merge of the sunxi tree Daniel Vetter <daniel@ffwll.ch> - 2017-03-08 11:30 +0100
csiph-web