Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 672a9c10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  kfifo: fix inaccurate comment
  tools/thermal: tmon: fix for segfault
  net: Spelling s/stucture/structure/
  edd: don't spam log if no EDD information is present
  Documentation: Fix early-microcode.txt references after file rename
  tracing: Block comments should align the * on each line
  treewide: Fix typos in printk
  GenWQE: Fix a typo in two comments
  treewide: Align function definition open/close braces
parents e8403b49 75a24b82

Documentation/x86/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 
	- this file

boot.txt

	- List of boot protocol versions

early-microcode.txt

	- How to load microcode from an initrd-CPIO archive early to fix CPU issues.

earlyprintk.txt

	- Using earlyprintk with a USB2 debug port key.

entry_64.txt

	- Describe (some of the) kernel entry points for x86.

exception-tables.txt

	- why and how Linux kernel uses exception tables on x86

microcode.txt

	- How to load microcode from an initrd-CPIO archive early to fix CPU issues.

mtrr.txt

	- how to use x86 Memory Type Range Registers to increase performance

pat.txt

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ config MICROCODE 
	  the Linux kernel.



	  The preferred method to load microcode from a detached initrd is described

	  in Documentation/x86/early-microcode.txt. For that you need to enable

	  in Documentation/x86/microcode.txt. For that you need to enable

	  CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the

	  initrd for microcode blobs.

arch/x86/kernel/cpu/microcode/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static u8 amd_ucode_patch[PATCH_MAX_SIZE]; 


/*

 * Microcode patch container file is prepended to the initrd in cpio

 * format. See Documentation/x86/early-microcode.txt

 * format. See Documentation/x86/microcode.txt

 */

static const char

ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin";

drivers/firmware/edd.c

+3 −5
Original line number Diff line number Diff line
@@ -748,14 +748,12 @@ edd_init(void) 
	int rc=0;

	struct edd_device *edev;



	if (!edd_num_devices())

		return -ENODEV;



	printk(KERN_INFO "BIOS EDD facility v%s %s, %d devices found\n",

	       EDD_VERSION, EDD_DATE, edd_num_devices());



	if (!edd_num_devices()) {

		printk(KERN_INFO "EDD information not available.\n");

		return -ENODEV;

	}



	edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);

	if (!edd_kset)

		return -ENOMEM;

drivers/fmc/fmc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ int fmc_device_register_n_gw(struct fmc_device **devs, int n, 
		if (!fmc->carrier_name || !fmc->carrier_data ||

		    !fmc->device_id) {

			dev_err(fmc->hwdev,

				"deivce nr %i: carrier name, "

				"device nr %i: carrier name, "

				"data or dev_id not set\n", i);

			ret = -EINVAL;

		}