From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Dave Airlie" <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
"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: Re: linux-next: manual merge of the staging tree with the drm tree
Date: Tue, 20 Nov 2018 09:54:47 +0100 [thread overview]
Message-ID: <20181120085447.GB19171@kroah.com> (raw)
In-Reply-To: <20181120131616.139a4c8f@canb.auug.org.au>
On Tue, Nov 20, 2018 at 01:16:16PM +1100, Stephen Rothwell wrote:
> 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.
Fix seems sane to me, thanks.
greg k-h
next prev parent reply other threads:[~2018-11-20 8:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 2:16 Stephen Rothwell
2018-11-20 8:54 ` Greg KH [this message]
-- 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
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=20181120085447.GB19171@kroah.com \
--to=greg@kroah.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®