linux-next: manual merge of the perf tree with the perf-current tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json

between commit:

  a89a17e152c8e ("perf vendor events arm64 AmpereOneX: Deprecate BPU_FLUSH_MEM_FAULT")

from the perf-current tree and commit:

  294b096cafe17 ("perf vendor events arm64 AmpereOneX: Deprecate BPU_FLUSH_MEM_FAULT")

from the perf tree.

I fixed it up (see 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.

The -next copy of the cherry pick has an extra '.'.

diff --combined tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json
index 114f95e41e0d5,b0934a7b252c3..0000000000000
--- a/tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json
+++ b/tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json
@@@ -35,7 -35,7 +35,7 @@@
          "ArchStdEvent": "MEM_ACCESS_CHECKED_WR"
      },
      {
 -        "PublicDescription": "This event is deprecated. Refer to new event GPC_FLUSH_MEM_FAULT. Flushes due to memory hazards",
 +        "PublicDescription": "This event is deprecated. Refer to new event GPC_FLUSH_MEM_FAULT Flushes due to memory hazards",
          "EventCode": "0x121",
          "EventName": "BPU_FLUSH_MEM_FAULT",
          "BriefDescription": "This event is deprecated. Refer to new event GPC_FLUSH_MEM_FAULT",

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]