Merge "Merge remote-tracking branch '4.9/tmp-a6e00ae' into msm-4.9" into msm-4.9 (b123a145) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/kernel-parameters.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1401,6 +1401,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		When zero, profiling data is discarded and associated
		debugfs files are removed at module unload time.

		goldfish [X86] Enable the goldfish android emulator platform.
		Don't use this when you are not running on the
		android emulator

		gpt [EFI] Forces disk with valid GPT signature but
		invalid Protective MBR to be treated as GPT. If the
		primary GPT is corrupted, it enables the backup/alternate

+1 −1

+13 −1

Original line number	Diff line number	Diff line
		@@ -42,8 +42,20 @@ static struct resource goldfish_pdev_bus_resources[] = {
		}
		};

		static bool goldfish_enable __initdata;

		static int __init goldfish_setup(char *str)
		{
		goldfish_enable = true;
		return 0;
		}
		__setup("goldfish", goldfish_setup);

		static int __init goldfish_init(void)
		{
		if (!goldfish_enable)
		return -ENODEV;

		platform_device_register_simple("goldfish_pdev_bus", -1,
		goldfish_pdev_bus_resources, 2);
		return 0;

+2 −0

Original line number	Diff line number	Diff line
		@@ -585,6 +585,8 @@ static int verify_verity_signature(char *key_id,

		if (IS_ERR(pks)) {
		DMERR("hashing failed");
		retval = PTR_ERR(pks);
		pks = NULL;
		goto error;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -567,10 +567,14 @@ int mlx5e_stats_flower(struct mlx5e_priv *priv,

		mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);

		preempt_disable();

		tcf_exts_to_list(f->exts, &actions);
		list_for_each_entry(a, &actions, list)
		tcf_action_stats_update(a, bytes, packets, lastuse);

		preempt_enable();

		return 0;
		}