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

Commit 877a0a01 authored by Kyle Yan's avatar Kyle Yan
Browse files

Merge remote-tracking branch '4.9/tmp-a6e00ae8' into msm-4.9 



* 4.9/tmp-a6e00ae8:
  ANDROID: dm: android-verity: fix table_make_digest() error handling
  UPSTREAM: net: core: add missing check for uid_range in rule_exists.
  Linux 4.9.13
  xfs: clear delalloc and cache on buffered write failure
  rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down
  block: fix double-free in the failure path of cgwb_bdi_init()
  ACPICA: Linuxize: Restore and fix Intel compiler build
  netfilter: nf_ct_helper: warn when not applying default helper assignment
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  USB: serial: console: fix uninitialised spinlock
  USB: serial: ark3116: fix register-accessor error handling
  USB: serial: opticon: fix CTS retrieval at open
  USB: serial: spcp8x5: fix modem-status handling
  USB: serial: ftdi_sio: fix line-status over-reporting
  USB: serial: ftdi_sio: fix extreme low-latency setting
  USB: serial: ftdi_sio: fix modem-status error handling
  USB: serial: cp210x: add new IDs for GE Bx50v3 boards
  USB: serial: mos7840: fix another NULL-deref at open
  tty: serial: msm: Fix module autoload
  net: socket: fix recvmmsg not returning error from sock_error
  ip: fix IP_CHECKSUM handling
  ptr_ring: fix race conditions when resizing
  irda: Fix lockdep annotations in hashbin_delete().
  vxlan: fix oops in dev_fill_metadata_dst
  dccp: fix freeing skb too early for IPV6_RECVPKTINFO
  net: neigh: Fix netevent NETEVENT_DELAY_PROBE_TIME_UPDATE notification
  packet: Do not call fanout_release from atomic contexts
  packet: fix races in fanout_add()
  net: ethernet: ti: cpsw: fix cpsw assignment in resume
  net/llc: avoid BUG_ON() in skb_orphan()
  net/mlx5e: Disable preemption when doing TC statistics upcall
  kcm: fix a null pointer dereference in kcm_sendmsg()
  kcm: fix 0-length case for kcm_sendmsg()

Change-Id: Iffe8fae4ede4d9a7f39d6e5dc87d558657ca0784
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents ab6b841b a6e00ae8

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

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/md/dm-android-verity.c

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

	}

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;

}