]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2019 03:40:40 +0000 (19:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2019 03:40:40 +0000 (19:40 -0800)
Pull printk updates from Petr Mladek:

 - Allow to print symbolic error names via new %pe modifier.

 - Use pr_warn() instead of the remaining pr_warning() calls. Fix
   formatting of the related lines.

 - Add VSPRINTF entry to MAINTAINERS.

* tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: (32 commits)
  checkpatch: don't warn about new vsprintf pointer extension '%pe'
  MAINTAINERS: Add VSPRINTF
  tools lib api: Renaming pr_warning to pr_warn
  ASoC: samsung: Use pr_warn instead of pr_warning
  lib: cpu_rmap: Use pr_warn instead of pr_warning
  trace: Use pr_warn instead of pr_warning
  dma-debug: Use pr_warn instead of pr_warning
  vgacon: Use pr_warn instead of pr_warning
  fs: afs: Use pr_warn instead of pr_warning
  sh/intc: Use pr_warn instead of pr_warning
  scsi: Use pr_warn instead of pr_warning
  platform/x86: intel_oaktrail: Use pr_warn instead of pr_warning
  platform/x86: asus-laptop: Use pr_warn instead of pr_warning
  platform/x86: eeepc-laptop: Use pr_warn instead of pr_warning
  oprofile: Use pr_warn instead of pr_warning
  of: Use pr_warn instead of pr_warning
  macintosh: Use pr_warn instead of pr_warning
  idsn: Use pr_warn instead of pr_warning
  ide: Use pr_warn instead of pr_warning
  crypto: n2: Use pr_warn instead of pr_warning
  ...

24 files changed:
1  2 
Documentation/core-api/printk-formats.rst
MAINTAINERS
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/smp.c
arch/ia64/kernel/setup.c
arch/x86/kernel/amd_gart_64.c
arch/x86/kernel/apic/apic.c
arch/x86/kernel/umip.c
arch/x86/mm/testmmiotrace.c
drivers/acpi/apei/ghes.c
drivers/crypto/n2_core.c
drivers/isdn/hardware/mISDN/avmfritz.c
drivers/isdn/hardware/mISDN/hfcpci.c
drivers/isdn/hardware/mISDN/hfcsusb.c
drivers/isdn/hardware/mISDN/mISDNipac.c
drivers/isdn/hardware/mISDN/mISDNisar.c
drivers/isdn/hardware/mISDN/netjet.c
drivers/isdn/hardware/mISDN/w6692.c
drivers/of/fdt.c
fs/afs/inode.c
fs/afs/yfsclient.c
lib/Kconfig.debug
lib/Makefile
scripts/checkpatch.pl

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 548fefed71eecdcfcd2437341ae7f7f4dfa7197e,de340e47f82d8ec333144dec73e78c405c3f9a71..b4a3048931898b6fd89e83530128f4ffadb01cba
@@@ -380,17 -370,16 +380,17 @@@ bool fixup_umip_exception(struct pt_reg
        if (umip_inst < 0)
                return false;
  
-       umip_pr_warning(regs, "%s instruction cannot be used by applications.\n",
+       umip_pr_warn(regs, "%s instruction cannot be used by applications.\n",
                        umip_insns[umip_inst]);
  
 -      /* Do not emulate SLDT, STR or user long mode processes. */
 -      if (umip_inst == UMIP_INST_STR || umip_inst == UMIP_INST_SLDT || user_64bit_mode(regs))
 +      /* Do not emulate (spoof) SLDT or STR. */
 +      if (umip_inst == UMIP_INST_STR || umip_inst == UMIP_INST_SLDT)
                return false;
  
-       umip_pr_warning(regs, "For now, expensive software emulation returns the result.\n");
+       umip_pr_warn(regs, "For now, expensive software emulation returns the result.\n");
  
 -      if (emulate_umip_insn(&insn, umip_inst, dummy_data, &dummy_data_size))
 +      if (emulate_umip_insn(&insn, umip_inst, dummy_data, &dummy_data_size,
 +                            user_64bit_mode(regs)))
                return false;
  
        /*
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/afs/inode.c
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile
Simple merge
Simple merge