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

Commit 3447e207 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.225(ca8aaf9e) into msm-4.9"

parents 63d61b62 74dc7691

Documentation/networking/l2tp.txt

+4 −4
Original line number Diff line number Diff line
@@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask. 


The following debug mask bits are available:



PPPOL2TP_MSG_DEBUG    verbose debug (if compiled in)

PPPOL2TP_MSG_CONTROL  userspace - kernel interface

PPPOL2TP_MSG_SEQ      sequence numbers handling

PPPOL2TP_MSG_DATA     data packets

L2TP_MSG_DEBUG    verbose debug (if compiled in)

L2TP_MSG_CONTROL  userspace - kernel interface

L2TP_MSG_SEQ      sequence numbers handling

L2TP_MSG_DATA     data packets



If enabled, files under a l2tp debugfs directory can be used to dump

kernel state about L2TP tunnels and sessions. To access it, the

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 224

SUBLEVEL = 225

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/include/asm/futex.h

+7 −2
Original line number Diff line number Diff line
@@ -162,7 +162,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 
	preempt_enable();

#endif



	if (!ret)

	/*

	 * Store unconditionally. If ret != 0 the extra store is the least

	 * of the worries but GCC cannot figure out that __futex_atomic_op()

	 * is either setting ret to -EFAULT or storing the old value in

	 * oldval which results in a uninitialized warning at the call site.

	 */

	*oval = oldval;



	return ret;

arch/arm64/kernel/machine_kexec.c

+2 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ void machine_kexec(struct kimage *kimage) 
	/* Flush the reboot_code_buffer in preparation for its execution. */

	__flush_dcache_area(reboot_code_buffer, arm64_relocate_new_kernel_size);

	flush_icache_range((uintptr_t)reboot_code_buffer,

			   (uintptr_t)reboot_code_buffer +

			   arm64_relocate_new_kernel_size);



	/* Flush the kimage list and its buffers. */

drivers/base/component.c

+5 −3
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static int try_to_bring_up_master(struct master *master, 
	ret = master->ops->bind(master->dev);

	if (ret < 0) {

		devres_release_group(master->dev, NULL);

		if (ret != -EPROBE_DEFER)

			dev_info(master->dev, "master bind failed: %d\n", ret);

		return ret;

	}
@@ -431,6 +432,7 @@ static int component_bind(struct component *component, struct master *master, 
		devres_release_group(component->dev, NULL);

		devres_release_group(master->dev, NULL);



		if (ret != -EPROBE_DEFER)

			dev_err(master->dev, "failed to bind %s (ops %ps): %d\n",

				dev_name(component->dev), component->ops, ret);

	}