Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1232067

Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Show all headers | View raw

Hi Jani,

On Thu, 24 Sep 2015 11:57:05 +0300 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> That was the right thing to do.
> 
> The former commit is headed for v4.3, and there will have to be another
> version of it for -next. This will cause you another conflict, and you
> should resolve it with the same approach.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm-intel tree with the  drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-24 03:30 +0200
  Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Jani Nikula <jani.nikula@linux.intel.com> - 2015-09-24 11:00 +0200
    Re: linux-next: manual merge of the drm-intel tree with the  drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-24 14:00 +0200

csiph-web