From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christian Gromm <christian.gromm@microchip.com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree
Date: Mon, 4 Dec 2017 10:09:59 +0100 [thread overview]
Message-ID: <20171204090959.GB16936@kroah.com> (raw)
In-Reply-To: <20171204125811.787cba01@canb.auug.org.au>
On Mon, Dec 04, 2017 at 12:58:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/most/cdev/cdev.c
>
> between commit:
>
> afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
>
> from the vfs tree and commit:
>
> 1fd923f38610 ("staging: most: cdev: replace function prefix")
>
> from the staging tree.
>
> I fixed it up (see below) 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 looks correct to me, thanks.
greg k-h
next prev parent reply other threads:[~2017-12-04 9:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 1:58 linux-next: manual merge of the staging tree with the vfs tree Stephen Rothwell
2017-12-04 9:09 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-12 5:16 Stephen Rothwell
2020-03-12 7:36 ` Greg KH
2018-10-09 4:59 Stephen Rothwell
2018-10-09 9:18 ` Greg KH
2018-03-13 4:22 Stephen Rothwell
2018-03-13 8:47 ` Greg KH
2017-12-04 2:06 Stephen Rothwell
2017-12-04 9:10 ` Greg KH
2017-11-09 4:01 Stephen Rothwell
2017-11-09 8:34 ` Greg KH
2016-12-12 4:21 Stephen Rothwell
2016-09-20 5:03 Stephen Rothwell
2016-09-20 11:14 ` Greg KH
2016-05-03 6:44 Stephen Rothwell
2016-05-03 18:19 ` Greg KH
2014-12-15 4:06 Stephen Rothwell
2014-11-27 9:11 Stephen Rothwell
2014-11-27 9:31 ` Stephen Rothwell
2014-11-27 16:20 ` Greg KH
2014-11-03 2:39 Stephen Rothwell
2014-11-03 2:31 Stephen Rothwell
2014-11-03 2:29 Stephen Rothwell
2014-11-03 23:57 ` Greg KH
2013-04-10 5:54 Stephen Rothwell
2013-04-10 14:57 ` Greg KH
2013-04-04 4:43 Stephen Rothwell
2013-04-05 1:44 ` Greg KH
2013-04-04 4:40 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2013-04-04 4:34 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2012-09-24 7:07 Stephen Rothwell
2012-09-25 22:38 ` 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=20171204090959.GB16936@kroah.com \
--to=greg@kroah.com \
--cc=christian.gromm@microchip.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.