From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>, 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>,
Gerd Hoffmann <kraxel@redhat.com>,
Dan Williams <dan.j.williams@intel.com>,
Alexander Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the char-misc tree with the drm tree
Date: Wed, 17 Oct 2018 07:01:12 +0200 [thread overview]
Message-ID: <20181017050112.GA22447@kroah.com> (raw)
In-Reply-To: <20181017142257.5002799b@canb.auug.org.au>
On Wed, Oct 17, 2018 at 02:22:57PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> fbb0de795078 ("Add udmabuf misc device")
>
> from the drm tree and commit:
>
> 9793c1fd1775 ("MAINTAINERS: Clarify UIO vs UIOVEC maintainer")
>
> from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2018-10-17 5:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 3:22 linux-next: manual merge of the char-misc tree with the drm tree Stephen Rothwell
2018-10-17 5:01 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-22 9:53 Mark Brown
2025-09-22 12:04 ` Greg KH
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=20181017050112.GA22447@kroah.com \
--to=greg@kroah.com \
--cc=airlied@linux.ie \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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