From: Stafford Horne <shorne@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Geert Uytterhoeven <geert@linux-m68k•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the openrisc tree with Linus' tree
Date: Mon, 25 Jan 2021 10:04:46 +0900 [thread overview]
Message-ID: <20210125010446.GS2002709@lianli.shorne-pla.net> (raw)
In-Reply-To: <20210125090506.35337fa2@canb.auug.org.au>
On Mon, Jan 25, 2021 at 09:05:06AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the openrisc tree got a conflict in:
>
> drivers/soc/litex/litex_soc_ctrl.c
>
> between commit:
>
> e6dc077b7dff ("soc: litex: Fix compile warning when device tree is not configured")
>
> from Linus' tree and commit:
>
> 3706f9f76a4f ("drivers/soc/litex: Add restart handler")
>
> from the openrisc 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.
Hi Stephen,
Thank's I knew about this conflict but I was not sure the best way to handle, I
was/am going to rebase the openrisc/for-next branch onto 5.11-rc5 once released.
I will resolve the conflict during the rebase so you should be able to drop the
conflict patch after that.
The issue is I had a fix that went straight to 5.11. Should I usually put these
kind of fixes on my for-next and my fixes branches in parallel, that way I can
resolve conflicts on for-next before hand?
I don't usually do that as in my mind for next is for 5.12 and fixes for 5.11 go
straight to 5.11. Also, I don't like putting the same patch in 2 queues. But
if I got any advice on how to avoid this in the future it would be appreciated.
Thank you,
-Stafford
next prev parent reply other threads:[~2021-01-25 1:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 22:05 linux-next: manual merge of the openrisc tree with Linus' tree Stephen Rothwell
2021-01-25 1:04 ` Stafford Horne [this message]
2021-01-25 1:47 ` Stephen Rothwell
2021-01-25 2:06 ` Stafford Horne
-- strict thread matches above, loose matches on Subject: below --
2011-09-13 2:11 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=20210125010446.GS2002709@lianli.shorne-pla.net \
--to=shorne@gmail$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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