linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [GIT pull] perf/urgent for 5.10-rc1
Date: Sun, 25 Oct 2020 14:25:05 -0000	[thread overview]
Message-ID: <160363590585.1234.15412286970681035533.tglx@nanos> (raw)
In-Reply-To: 160363590465.1234.11586095980767794789.tglx@nanos

Linus,

please pull the latest perf/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2020-10-25

up to:  f3d301c1f2f5: perf: correct SNOOPX field offset


A single fix to compute the field offset of the SNOOPX bit in the data
source bitmask of perf events correctly.

Thanks,

	tglx

------------------>
Al Grant (1):
      perf: correct SNOOPX field offset


 include/uapi/linux/perf_event.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 077e7ee69e3d..b95d3c485d27 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -1196,7 +1196,7 @@ union perf_mem_data_src {
 
 #define PERF_MEM_SNOOPX_FWD	0x01 /* forward */
 /* 1 free */
-#define PERF_MEM_SNOOPX_SHIFT	37
+#define PERF_MEM_SNOOPX_SHIFT  38
 
 /* locked instruction */
 #define PERF_MEM_LOCK_NA	0x01 /* not available */


  reply	other threads:[~2020-10-25 14:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-25 14:25 [GIT pull] locking/urgent for 5.10-rc1 Thomas Gleixner
2020-10-25 14:25 ` Thomas Gleixner [this message]
2020-10-25 18:35   ` [GIT pull] perf/urgent " pr-tracker-bot
2020-10-25 14:25 ` [GIT pull] sched/urgent " Thomas Gleixner
2020-10-25 18:35   ` pr-tracker-bot
2020-10-25 14:25 ` [GIT pull] timers/urgent " Thomas Gleixner
2020-10-25 18:35   ` pr-tracker-bot
2020-10-25 14:25 ` [GIT pull] x86/urgent " Thomas Gleixner
2020-10-25 18:34   ` Linus Torvalds
2020-10-25 18:56     ` Thomas Gleixner
2020-10-25 18:35 ` [GIT pull] locking/urgent " pr-tracker-bot

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=160363590585.1234.15412286970681035533.tglx@nanos \
    --to=tglx@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).