From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>
Cc: "Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Christian König" <christian.koenig@amd•com>,
"Alex Deucher" <alexander.deucher@amd•com>,
"Hans de Goede" <hdegoede@redhat•com>
Subject: linux-next: manual merge of the staging tree with the drm tree
Date: Tue, 20 Nov 2018 13:16:16 +1100 [thread overview]
Message-ID: <20181120131616.139a4c8f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/vboxvideo/vbox_ttm.c
between commits:
a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")
from the drm tree and commit:
cd76c287a52f ("staging: vboxvideo: Cleanup the comments")
from the staging tree.
I fixed it up (the former removed the comments updated by the latter) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-11-20 2:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 2:16 Stephen Rothwell [this message]
2018-11-20 8:54 ` linux-next: manual merge of the staging tree with the drm tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2016-06-20 4:33 Stephen Rothwell
2016-07-25 6:29 ` Stephen Rothwell
2014-03-19 4:22 Stephen Rothwell
2009-03-20 4:38 Stephen Rothwell
2009-03-20 5:15 ` Greg KH
2009-03-20 5:42 ` 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=20181120131616.139a4c8f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=alexander.deucher@amd$(echo .)com \
--cc=christian.koenig@amd$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=greg@kroah$(echo .)com \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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