From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eduardo Valentin <edubezval@gmail•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Gal Pressman <galpress@amazon•com>,
Jason Gunthorpe <jgg@mellanox•com>,
Talel Shenhar <talel@amazon•com>
Subject: Re: linux-next: manual merge of the thermal-soc tree with Linus' tree
Date: Wed, 15 May 2019 10:44:31 +1000 [thread overview]
Message-ID: <20190515104431.5e353729@canb.auug.org.au> (raw)
In-Reply-To: <20190514141531.GA16968@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
Hi Eduardo,
On Tue, 14 May 2019 07:15:33 -0700 Eduardo Valentin <edubezval@gmail•com> wrote:
>
> On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> > Hi Eduardo,
> >
> > On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <edubezval@gmail•com> wrote:
> > >
> > > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > > where the last conflict went in with my current queue.
> >
> > Its really not worth the rebase. Just fix the build problem and send it
> > all to Linus.
>
> Yeah, I think I was not super clear in my first email. I am about to
> send the content of my branch to Linus. This specific conflict was
> because a change in MAINTAINERS went in before the change I have in it,
> causing a conflict there. The rebase is simply to make it easier for him
> to pull when I send the git pull.
Linus has repeated told people not to do that. He wants to see the
conflicts. You should mention any conflicts you know about in your pull
request - just as a heads up to him.
However, if a conflict is particularly tricky, it may be worth while to
a test merge in another branch and tell him about that other branch in
your pull request.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-05-15 0:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 0:49 linux-next: manual merge of the thermal-soc tree with Linus' tree Stephen Rothwell
2019-05-14 3:44 ` Eduardo Valentin
2019-05-14 4:40 ` Stephen Rothwell
2019-05-14 14:15 ` Eduardo Valentin
2019-05-15 0:44 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-15 0:05 Stephen Rothwell
2017-10-30 16:42 Mark Brown
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=20190515104431.5e353729@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=edubezval@gmail$(echo .)com \
--cc=galpress@amazon$(echo .)com \
--cc=jgg@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=talel@amazon$(echo .)com \
/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