linux-next: manual merge of the openrisc tree with Linus' tree
diff mbox series

Message ID 20210125090506.35337fa2@canb.auug.org.au
State New, archived
Headers show
Series
  • linux-next: manual merge of the openrisc tree with Linus' tree
Related show

Commit Message

Stephen Rothwell Jan. 24, 2021, 10:05 p.m. UTC
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.

Comments

Stafford Horne Jan. 25, 2021, 1:04 a.m. UTC | #1
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
Stephen Rothwell Jan. 25, 2021, 1:47 a.m. UTC | #2
Hi Stafford,

On Mon, 25 Jan 2021 10:04:46 +0900 Stafford Horne <shorne@gmail.com> wrote:
>
> 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.

Its a pretty trivial conflict, so I wouldn't do the rebase just for this.

> 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 notice that the version in Linus' tree was merged from a separate
branch.  The easiest that to do is for you to merge that same branch
into your for-next branch - that way you only get your own changes, not
any other stuff that might be in Linus' tree.

> 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.

Like I said, just merge your fixes branch into you for-next branch
when/if you think the fixes are important for further development, or
the conflicts become to great.

I can also add you fixes branch to linux-next if you like (I already
have 86 other "fixes" branches).
Stafford Horne Jan. 25, 2021, 2:06 a.m. UTC | #3
On Mon, Jan 25, 2021 at 12:47:46PM +1100, Stephen Rothwell wrote:
> Hi Stafford,
> 
> On Mon, 25 Jan 2021 10:04:46 +0900 Stafford Horne <shorne@gmail.com> wrote:
> >
> > 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.
> 
> Its a pretty trivial conflict, so I wouldn't do the rebase just for this.

Alright, I will not rebase.

> > 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 notice that the version in Linus' tree was merged from a separate
> branch.  The easiest that to do is for you to merge that same branch
> into your for-next branch - that way you only get your own changes, not
> any other stuff that might be in Linus' tree.
> 
> > 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.
> 
> Like I said, just merge your fixes branch into you for-next branch
> when/if you think the fixes are important for further development, or
> the conflicts become to great.

That sounds like a good idea.  Let me do that.

> I can also add you fixes branch to linux-next if you like (I already
> have 86 other "fixes" branches).

I think that should be alright for now, I'll maintain merging the fixes branch
myself when I think it's needed.

Thank you,

-Stafford

Patch
diff mbox series

diff --cc drivers/soc/litex/litex_soc_ctrl.c
index 9b0766384570,a7dd5be9fd5b..000000000000
--- a/drivers/soc/litex/litex_soc_ctrl.c