From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>, David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dan Carpenter <dan.carpenter@oracle.com>,
YueHaibing <yuehaibing@huawei.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the net-next tree
Date: Thu, 20 Dec 2018 07:32:25 +0100 [thread overview]
Message-ID: <20181220063225.GA2294@kroah.com> (raw)
In-Reply-To: <20181220170253.011d0b10@canb.auug.org.au>
On Thu, Dec 20, 2018 at 05:02:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/ptp/ptp_clock.c
>
> between commit:
>
> aea0a897af9e ("ptp: Fix pass zero to ERR_PTR() in ptp_clock_register")
>
> from the net-next tree and commit:
>
> b9d93594c767 ("ptp: fix an IS_ERR() vs NULL check")
>
> from the char-misc tree.
>
> I fixed it up (I just used the latter version) 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.
Thanks for the merge fix, that is correct.
greg k-h
next prev parent reply other threads:[~2018-12-20 6:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 6:02 linux-next: manual merge of the char-misc tree with the net-next tree Stephen Rothwell
2018-12-20 6:32 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 5:45 Stephen Rothwell
2022-03-15 7:35 ` Greg KH
2022-03-22 8:53 ` Geert Uytterhoeven
2016-09-05 6:56 Stephen Rothwell
2016-09-05 11:33 ` Greg KH
2016-09-06 5:36 ` KY Srinivasan
2016-09-06 10:28 ` KY Srinivasan
[not found] ` <BLUPR0301MB209827200D789C51EC56DA41CCF90@BLUPR0301MB2098.namprd03.prod.outlook.com>
2016-09-07 6:47 ` Greg KH
[not found] ` <BY2PR0301MB2104C50A152139E94BC3E442CCF80@BY2PR0301MB2104.namprd03.prod.outlook.com>
2016-09-08 10:21 ` 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=20181220063225.GA2294@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yuehaibing@huawei.com \
/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.