From: Michael Ellerman <mpe@ellerman•id.au>
To: Jiri Kosina <jikos@kernel•org>
Cc: Petr Mladek <pmladek@suse•com>,
linuxppc-dev@ozlabs•org, jeyu@redhat•com,
linux-kernel@vger•kernel.org, rostedt@goodmis•org,
kamalesh@linux•vnet.ibm.com, duwe@lst•de,
live-patching@vger•kernel.org, mbenes@suse•cz,
Torsten Duwe <duwe@suse•de>,
vojtech@suse•com, jpoimboe@redhat•com, sjenning@redhat•com
Subject: Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc)
Date: Mon, 07 Mar 2016 21:06:01 +1100 [thread overview]
Message-ID: <1457345161.18915.3.camel@ellerman.id.au> (raw)
In-Reply-To: <alpine.LNX.2.00.1603040952330.3656@cbobk.fhfr.pm>
On Fri, 2016-03-04 at 09:56 +0100, Jiri Kosina wrote:
> On Fri, 4 Mar 2016, Michael Ellerman wrote:
>
> > Obviously it depends heavily on the content of my series, which will go into
> > powerpc#next, so it would make sense if this went there too.
> >
> > I don't see any changes in linux-next for livepatch, so merging it via powerpc
> > would probably work fine and not cause any conflicts, unless there's some
> > livepatch changes pending for 4.6 that aren't in linux-next yet?
> >
> > The other option is that I put my ftrace changes and this in a topic branch
> > (based on v4.5-rc3), and then that can be merged into both powerpc#next and the
> > livepatch tree.
>
> This aligns with my usual workflow, so that'd be my preferred way of doing
> things; i.e. you put all the ftrace changes into a separate topic branch,
> and then
>
> - you pull that branch into powerpc#next
> - I pull that branch into livepatching tree
> - I apply the ppc livepatching support on top of that
> - I send a pull request to Linus only after powerpc#next gets merged to
> Linus' tree
>
> Sounds good?
Yep, here it is:
https://git.kernel.org/cgit/linux/kernel/git/powerpc/linux.git/log/?h=topic/mprofile-kernel
aka:
git fetch git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/mprofile-kernel
I haven't merged it into my next yet, but I will tomorrow unless you tell me
there's something wrong with it.
cheers
next prev parent reply other threads:[~2016-03-07 10:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 16:52 [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Petr Mladek
2016-03-03 20:43 ` Balbir Singh
2016-03-04 6:08 ` Kamalesh Babulal
2016-03-04 7:58 ` Michael Ellerman
2016-03-04 9:31 ` Miroslav Benes
2016-03-07 3:29 ` Michael Ellerman
2016-03-04 8:06 ` How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc) Michael Ellerman
2016-03-04 8:56 ` Jiri Kosina
2016-03-07 10:06 ` Michael Ellerman [this message]
2016-03-07 22:52 ` Jiri Kosina
2016-03-07 23:20 ` Michael Ellerman
2016-03-08 1:53 ` Steven Rostedt
2016-03-07 23:22 ` Josh Poimboeuf
2016-03-04 12:42 ` [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe
2016-03-04 13:01 ` Petr Mladek
2016-03-04 18:16 ` Torsten Duwe
2016-03-04 19:22 ` Torsten Duwe
2016-03-08 11:14 ` Torsten Duwe
2016-03-06 23:55 ` Balbir Singh
2016-03-04 21:56 ` Josh Poimboeuf
2016-03-08 21:42 ` Steven Rostedt
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=1457345161.18915.3.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=duwe@lst$(echo .)de \
--cc=duwe@suse$(echo .)de \
--cc=jeyu@redhat$(echo .)com \
--cc=jikos@kernel$(echo .)org \
--cc=jpoimboe@redhat$(echo .)com \
--cc=kamalesh@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=live-patching@vger$(echo .)kernel.org \
--cc=mbenes@suse$(echo .)cz \
--cc=pmladek@suse$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
--cc=sjenning@redhat$(echo .)com \
--cc=vojtech@suse$(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