From: Stephen Rothwell <sfr@canb•auug.org.au>
To: DRI <dri-devel@lists•freedesktop.org>,
Bjorn Helgaas <bhelgaas@google•com>,
Dave Airlie <airlied@linux•ie>
Cc: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Daniele Ceraolo Spurio <daniele.ceraolospurio@intel•com>,
Chris Wilson <chris@chris-wilson•co.uk>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Subject: Re: linux-next: manual merge of the drm-intel tree with the pci tree
Date: Mon, 24 Jun 2019 13:53:52 +1000 [thread overview]
Message-ID: <20190624135352.18b7dd23@canb.auug.org.au> (raw)
In-Reply-To: <20190617132027.3e34597d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1046 bytes --]
Hi all,
On Mon, 17 Jun 2019 13:20:27 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commit:
>
> 151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
>
> from the pci tree and commit:
>
> 1bf676cc2dba ("drm/i915: move and rename i915_runtime_pm")
>
> from the drm-intel tree.
>
> I fixed it up (I just removed the struct definition form this files as
> the latter did - its comment will need to be fixed up in its new file)
> 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.
This is now a conflict between the drm and pci trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-06-24 3:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 3:20 linux-next: manual merge of the drm-intel tree with the pci tree Stephen Rothwell
2019-06-24 3:53 ` Stephen Rothwell [this message]
2019-07-08 23:55 ` Stephen Rothwell
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=20190624135352.18b7dd23@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=bhelgaas@google$(echo .)com \
--cc=chris@chris-wilson$(echo .)co.uk \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=daniele.ceraolospurio@intel$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=rodrigo.vivi@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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