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

Commit a6e00ae8 authored by Todd Kjos's avatar Todd Kjos
Browse files

Merge branch 'upstream-linux-4.9.y' into android-4.9

parents d3196606 3737a5f7

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,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

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 12

SUBLEVEL = 13

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/platform/goldfish/goldfish.c

+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;

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+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;

}

drivers/net/ethernet/ti/cpsw.c

+1 −1
Original line number Diff line number Diff line
@@ -2925,7 +2925,7 @@ static int cpsw_resume(struct device *dev) 
{

	struct platform_device	*pdev = to_platform_device(dev);

	struct net_device	*ndev = platform_get_drvdata(pdev);

	struct cpsw_common	*cpsw = netdev_priv(ndev);

	struct cpsw_common	*cpsw = ndev_to_cpsw(ndev);



	/* Select default pin state */

	pinctrl_pm_select_default_state(dev);