Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1720977
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the drm tree with Linus' tree |
| Date | Mon, 28 Aug 2017 04:40:02 +0200 |
| Message-ID | <uji82-89h-3@gated-at.bofh.it> (permalink) |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1503887559; bh=TSpVJUKVBx7xYqs5ueogjwck1VHIzse4XDlFJw5Mm74=; h=Date:From:To:Cc:Subject:From; b=c/Fg6OanWX6lDiTFl2vCtfTRqWJm2TnNnZVvmTenv8uxLoUKi8exj0uVsgGGLqtHd TVDICWV39bgVf09b4fAv2Yej1VJUTy1ZpdHSSTG62x1mK61n64WthMToXe5PZ+jCoh 7mjxY6fMsobqAf1RlJ/IamXFq4a4SNzDGw2msk11x268KowzND95XTcCFbh+lEpuKF kIY+Ive4Tt2o1KqDPxzGy0J4NnZJ23lnofYrqlMBpCka0kSIxnpfbO+QsFGVtH36c/ Vpv3OuSfNxAuUsTOTZ7BDdO1gWxy4/9RQ/0f8pPsPHog/0H1OLwdZ3fKaJCNrdzIbR cEQPDUz/rbzWQ== |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 26 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Philipp Zabel <p.zabel@pengutronix.de> |
| X-Original-Date | Mon, 28 Aug 2017 12:32:38 +1000 |
| X-Original-Message-ID | <20170828123238.410885a1@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1720977 |
Show key headers only | View raw
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/imx/ipuv3-plane.c
between commit:
5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane")
from Linus' tree and commit:
58dff39904c0 ("drm/imx: ipuv3-plane: use fb local variable instead of state->fb")
from the drm tree.
I fixed it up (the former included the latter change) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-28 04:40 +0200
csiph-web