From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Michael Ellerman <mpe@ellerman.id.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Lee Jones <lee.jones@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alastair D'Silva <alastair@d-silva.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the powerpc tree
Date: Thu, 6 Aug 2020 09:40:05 +1000 [thread overview]
Message-ID: <20200806094005.29296b53@canb.auug.org.au> (raw)
In-Reply-To: <20200803165546.6ab5ab6f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
Hi all,
On Mon, 3 Aug 2020 16:55:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/misc/ocxl/config.c
>
> between commit:
>
> 3591538a31af ("ocxl: Address kernel doc errors & warnings")
>
> from the powerpc tree and commit:
>
> 28fc491e9be6 ("misc: ocxl: config: Provide correct formatting to function headers")
>
> from the char-misc tree.
>
> I fixed it up (as it was just differences in comments, I just arbitrarily
> chose 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.
This is now a conflict between the powerpc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-05 23:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 6:55 linux-next: manual merge of the char-misc tree with the powerpc tree Stephen Rothwell
2020-08-05 23:40 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 7:35 Stephen Rothwell
2020-10-06 8:21 ` Greg KH
2020-10-15 23:12 ` Stephen Rothwell
2012-03-16 5:52 Stephen Rothwell
2012-03-16 15:29 ` 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=20200806094005.29296b53@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alastair@d-silva.org \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.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;
as well as URLs for NNTP newsgroup(s).