[GIT PULL] x86/cleanups for v4.18

[Ingo Molnar]

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus

   # HEAD: 844ea8f62619ac2a5e47d13e3449ac197067b414 x86/apm: Fix spelling mistake: "caculate" -> "calculate"

Misc cleanups.

 Thanks,

	Ingo

------------------>
Colin Ian King (1):
      x86/apm: Fix spelling mistake: "caculate" -> "calculate"

Ingo Molnar (1):
      x86/bpf: Clean up non-standard comments, to make the code more readable

Joe Perches (3):
      x86/early-quirks: Rename duplicate define of dev_err
      x86: Remove pr_fmt duplicate logging prefixes
      x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes


 arch/x86/events/amd/ibs.c                   |   2 +-
 arch/x86/kernel/apm_32.c                    |   2 +-
 arch/x86/kernel/cpu/mtrr/Makefile           |   2 +-
 arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} |  33 ++--
 arch/x86/kernel/e820.c                      |  32 ++--
 arch/x86/kernel/early-quirks.c              |   8 +-
 arch/x86/kernel/hpet.c                      |   5 +-
 arch/x86/kernel/uprobes.c                   |   4 +-
 arch/x86/mm/numa.c                          |  22 +--
 arch/x86/net/bpf_jit_comp.c                 | 233 ++++++++++++++++------------
 10 files changed, 188 insertions(+), 155 deletions(-)
 rename arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} (96%)