Messages in this thread | | | Date | Thu, 24 Sep 2015 21:52:22 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree |
| |
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
| |