From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rich Felker <dalias@libc•org>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the tip tree with the sh tree
Date: Mon, 25 Jul 2016 14:16:40 +1000 [thread overview]
Message-ID: <20160725141640.4ee60f1f@canb.auug.org.au> (raw)
In-Reply-To: <20160725035503.GQ15995@brightrain.aerifal.cx>
Hi Rich,
On Sun, 24 Jul 2016 23:55:03 -0400 Rich Felker <dalias@libc•org> wrote:
>
> On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/sh/include/asm/spinlock.h
> >
> > between commit:
> >
> > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction")
> >
> > from the sh tree and commit:
> >
> > 726328d92a42 ("locking/spinlock, arch: Update and fix spin_unlock_wait() implementations")
> >
> > from the tip tree.
> >
> > I fixed it up (I used this file from the sh tree and then added the merge
> > fix patch 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.
>
> Assuming the J2 SMP changes go upstream this merge window, should I
> simply cite this conflict and your patch when sending the pull request
> to Linux, or include the merge fix patch myself?
Just mention it to Linus.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-07-25 4:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-24 5:13 linux-next: manual merge of the tip tree with the sh tree Stephen Rothwell
2016-07-25 3:55 ` Rich Felker
2016-07-25 4:16 ` Stephen Rothwell [this message]
2016-07-25 22:30 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-10-14 2:19 Stephen Rothwell
2010-07-28 4:35 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=20160725141640.4ee60f1f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dalias@libc$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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