From: dave.long@linaro.org (David Long)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] uprobes: Add uprobes support for ARM
Date: Tue, 18 Mar 2014 18:15:33 -0400 [thread overview]
Message-ID: <5328C585.6070100@linaro.org> (raw)
In-Reply-To: <20140317235229.GQ21483@n2100.arm.linux.org.uk>
On 03/17/14 19:52, Russell King - ARM Linux wrote:
> On Tue, Mar 11, 2014 at 02:36:09PM -0400, David Long wrote:
>> git://git.linaro.org/people/dave.long/linux.git uprobes-v7
>>
>> for you to fetch changes up to e55c35236b8adf79453a998506ec6081833b9484:
>>
>> ARM: add uprobes support (2014-03-11 11:40:29 -0400)
>
> I pulled this a week ago into my devel-testing (which is unpublished),
> and while it hasn't shown any signs of functional problems, I was just
> about to merge it into devel-stable when I noticed the history.
>
> This is based upon:
>
> Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
> + Linux 3.11
> + Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
> + Linux 3.12-rc5
> + Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
> + Linux 3.13-rc3
> + Linux 3.13-rc4
> + Linux 3.13-rc8
> + Linux 3.14-rc2
> + Linux 3.14-rc4
> + Linux 3.14-rc5
> |
> [your uprobes patches]
>
> where each + is a merge of the named commit into the previous. This is
> the kind of thing which will make Linus quite unhappy: please base
> patches off a plain -rc release, not off a merge commit.
>
> I'm sure there's others on the mailing list who can guide you on this
> point, but I do need to ask you to re-spin without those merges. I'm
> happy to take a respin of it provided it's based on 3.14-rc5 (so I can
> more easily confirm that there aren't any changes which I haven't
> already tested.)
OK, I consulted with a couple coworkers and the fix for this was
particularly easy. The respun branch is in place now. Same repo, same
branch name, based on v3.14-rc5. Sorry for the newbie mistake.
I'm assuming a new git-pull request is not required (until I hear
otherwise).
> Thanks, and sorry about the lateness of this email.
>
I'm just back Monday night from a few days vacation, so your timing was
perfect for me.
-dl
WARNING: multiple messages have this Message-ID (diff)
From: David Long <dave.long@linaro.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
Rabin Vincent <rabin@rab.in>,
"Jon Medhurst (Tixy)" <tixy@linaro.org>,
Oleg Nesterov <oleg@redhat.com>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
Ingo Molnar <mingo@redhat.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
davem@davemloft.net, Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] uprobes: Add uprobes support for ARM
Date: Tue, 18 Mar 2014 18:15:33 -0400 [thread overview]
Message-ID: <5328C585.6070100@linaro.org> (raw)
In-Reply-To: <20140317235229.GQ21483@n2100.arm.linux.org.uk>
On 03/17/14 19:52, Russell King - ARM Linux wrote:
> On Tue, Mar 11, 2014 at 02:36:09PM -0400, David Long wrote:
>> git://git.linaro.org/people/dave.long/linux.git uprobes-v7
>>
>> for you to fetch changes up to e55c35236b8adf79453a998506ec6081833b9484:
>>
>> ARM: add uprobes support (2014-03-11 11:40:29 -0400)
>
> I pulled this a week ago into my devel-testing (which is unpublished),
> and while it hasn't shown any signs of functional problems, I was just
> about to merge it into devel-stable when I noticed the history.
>
> This is based upon:
>
> Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
> + Linux 3.11
> + Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
> + Linux 3.12-rc5
> + Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
> + Linux 3.13-rc3
> + Linux 3.13-rc4
> + Linux 3.13-rc8
> + Linux 3.14-rc2
> + Linux 3.14-rc4
> + Linux 3.14-rc5
> |
> [your uprobes patches]
>
> where each + is a merge of the named commit into the previous. This is
> the kind of thing which will make Linus quite unhappy: please base
> patches off a plain -rc release, not off a merge commit.
>
> I'm sure there's others on the mailing list who can guide you on this
> point, but I do need to ask you to re-spin without those merges. I'm
> happy to take a respin of it provided it's based on 3.14-rc5 (so I can
> more easily confirm that there aren't any changes which I haven't
> already tested.)
OK, I consulted with a couple coworkers and the fix for this was
particularly easy. The respun branch is in place now. Same repo, same
branch name, based on v3.14-rc5. Sorry for the newbie mistake.
I'm assuming a new git-pull request is not required (until I hear
otherwise).
> Thanks, and sorry about the lateness of this email.
>
I'm just back Monday night from a few days vacation, so your timing was
perfect for me.
-dl
next prev parent reply other threads:[~2014-03-18 22:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 20:10 [PATCH v7 00/15] uprobes: Add uprobes support for ARM David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 01/15] uprobes: Kconfig dependency fix David Long
2014-03-07 20:10 ` David Long
2014-03-08 11:17 ` Russell King - ARM Linux
2014-03-08 11:17 ` Russell King - ARM Linux
2014-03-08 15:29 ` Oleg Nesterov
2014-03-08 15:29 ` Oleg Nesterov
2014-03-07 20:10 ` [PATCH v7 02/15] ARM: Fix missing includes in kprobes sources David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 03/15] uprobes: allow ignoring of probe hits David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 04/15] ARM: move shared uprobe/kprobe definitions into new include file David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 05/15] ARM: Move generic arm instruction parsing code to new files for sharing between features David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 06/15] ARM: move generic thumb instruction parsing code to new files for use by other feature David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 07/15] ARM: use a function table for determining instruction interpreter action David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 08/15] ARM: Remove use of struct kprobe from generic probes code David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 09/15] ARM: Make the kprobes condition_check symbol names more generic David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 10/15] ARM: Change more ARM kprobes symbol names to something " David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 11/15] ARM: Rename the shared kprobes/uprobe return value enum David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 12/15] ARM: Change the remaining shared kprobes/uprobes symbols to something generic David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 13/15] ARM: Add an emulate flag to the kprobes/uprobes instruction decode functions David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 14/15] ARM: Make arch_specific_insn a define for new arch_probes_insn structure David Long
2014-03-07 20:10 ` David Long
2014-03-07 20:10 ` [PATCH v7 15/15] ARM: add uprobes support David Long
2014-03-07 20:10 ` David Long
2014-03-08 11:18 ` [PATCH v7 00/15] uprobes: Add uprobes support for ARM Russell King - ARM Linux
2014-03-08 11:18 ` Russell King - ARM Linux
2014-03-11 18:36 ` [GIT PULL] " David Long
2014-03-11 18:36 ` David Long
2014-03-17 23:52 ` Russell King - ARM Linux
2014-03-17 23:52 ` Russell King - ARM Linux
2014-03-18 22:15 ` David Long [this message]
2014-03-18 22:15 ` David Long
2014-03-19 20:16 ` Russell King - ARM Linux
2014-03-19 20:16 ` Russell King - ARM Linux
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=5328C585.6070100@linaro.org \
--to=dave.long@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.