Merge "Merge android-4.14.49 into msm-4.14" (6b007898) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/networking/netdev-FAQ.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,15 @@ A: No. See above answer. In short, if you think it really belongs in
		dash marker line as described in Documentation/process/submitting-patches.rst to
		temporarily embed that information into the patch that you send.

		Q: Are all networking bug fixes backported to all stable releases?

		A: Due to capacity, Dave could only take care of the backports for the last
		2 stable releases. For earlier stable releases, each stable branch maintainer
		is supposed to take care of them. If you find any patch is missing from an
		earlier stable branch, please notify stable@vger.kernel.org with either a
		commit ID or a formal patch backported, and CC Dave and other relevant
		networking developers.

		Q: Someone said that the comment style and coding convention is different
		for the networking content. Is this true?

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 48
		SUBLEVEL = 49
		EXTRAVERSION =
		NAME = Petit Gorille

drivers/gpu/drm/drm_file.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ static int drm_open_helper(struct file filp, struct drm_minor minor)
		return -ENOMEM;

		filp->private_data = priv;
		filp->f_mode \|= FMODE_UNSIGNED_OFFSET;
		priv->filp = filp;
		priv->pid = get_pid(task_pid(current));
		priv->minor = minor;

drivers/isdn/hardware/eicon/diva.c

+15 −7

Original line number	Diff line number	Diff line
		@@ -388,10 +388,10 @@ void divasa_xdi_driver_unload(void)
		** Receive and process command from user mode utility
		*/
		void diva_xdi_open_adapter(void os_handle, const void __user *src,
		int length,
		int length, void *mptr,
		divas_xdi_copy_from_user_fn_t cp_fn)
		{
		diva_xdi_um_cfg_cmd_t msg;
		diva_xdi_um_cfg_cmd_t msg = (diva_xdi_um_cfg_cmd_t )mptr;
		diva_os_xdi_adapter_t *a = NULL;
		diva_os_spin_lock_magic_t old_irql;
		struct list_head *tmp;
		@@ -401,21 +401,21 @@ void diva_xdi_open_adapter(void os_handle, const void __user *src,
		length, sizeof(diva_xdi_um_cfg_cmd_t)))
		return NULL;
		}
		if ((*cp_fn) (os_handle, &msg, src, sizeof(msg)) <= 0) {
		if ((cp_fn) (os_handle, msg, src, sizeof(msg)) <= 0) {
		DBG_ERR(("A: A(?) open, write error"))
		return NULL;
		}
		diva_os_enter_spin_lock(&adapter_lock, &old_irql, "open_adapter");
		list_for_each(tmp, &adapter_queue) {
		a = list_entry(tmp, diva_os_xdi_adapter_t, link);
		if (a->controller == (int)msg.adapter)
		if (a->controller == (int)msg->adapter)
		break;
		a = NULL;
		}
		diva_os_leave_spin_lock(&adapter_lock, &old_irql, "open_adapter");

		if (!a) {
		DBG_ERR(("A: A(%d) open, adapter not found", msg.adapter))
		DBG_ERR(("A: A(%d) open, adapter not found", msg->adapter))
		}

		return (a);
		@@ -437,8 +437,10 @@ void diva_xdi_close_adapter(void adapter, void os_handle)

		int
		diva_xdi_write(void adapter, void os_handle, const void __user *src,
		int length, divas_xdi_copy_from_user_fn_t cp_fn)
		int length, void *mptr,
		divas_xdi_copy_from_user_fn_t cp_fn)
		{
		diva_xdi_um_cfg_cmd_t msg = (diva_xdi_um_cfg_cmd_t )mptr;
		diva_os_xdi_adapter_t a = (diva_os_xdi_adapter_t ) adapter;
		void *data;

		@@ -459,7 +461,13 @@ diva_xdi_write(void adapter, void os_handle, const void __user *src,
		return (-2);
		}

		if (msg) {
		(diva_xdi_um_cfg_cmd_t )data = *msg;
		length = (cp_fn) (os_handle, (char )data + sizeof(*msg),
		src + sizeof(msg), length - sizeof(msg));
		} else {
		length = (*cp_fn) (os_handle, data, src, length);
		}
		if (length > 0) {
		if ((*(a->interface.cmd_proc))
		(a, (diva_xdi_um_cfg_cmd_t *) data, length)) {

drivers/isdn/hardware/eicon/diva.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -20,10 +20,11 @@ int diva_xdi_read(void adapter, void os_handle, void __user *dst,
		int max_length, divas_xdi_copy_to_user_fn_t cp_fn);

		int diva_xdi_write(void adapter, void os_handle, const void __user *src,
		int length, divas_xdi_copy_from_user_fn_t cp_fn);
		int length, void *msg,
		divas_xdi_copy_from_user_fn_t cp_fn);

		void diva_xdi_open_adapter(void os_handle, const void __user *src,
		int length,
		int length, void *msg,
		divas_xdi_copy_from_user_fn_t cp_fn);

		void diva_xdi_close_adapter(void adapter, void os_handle);