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

Commit 64c139cc authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 08d69389 on remote branch 

Change-Id: Ifddef2bfbdb1e0a815726fc6d8f31fa07175426b
parents fd5f1456 08d69389

Documentation/networking/ip-sysctl.txt

+3 −1
Original line number Diff line number Diff line
@@ -912,12 +912,14 @@ icmp_ratelimit - INTEGER 
icmp_msgs_per_sec - INTEGER

	Limit maximal number of ICMP packets sent per second from this host.

	Only messages whose type matches icmp_ratemask (see below) are

	controlled by this limit.

	controlled by this limit. For security reasons, the precise count

	of messages per second is randomized.

	Default: 1000



icmp_msgs_burst - INTEGER

	icmp_msgs_per_sec controls number of ICMP packets sent per second,

	while icmp_msgs_burst controls the burst size of these packets.

	For security reasons, the precise burst size is randomized.

	Default: 50



icmp_ratemask - INTEGER

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, 2021 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -411,7 +411,7 @@ 
	};



	qcom,cam-sensor@3 {

		cell-index = <0>;

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		reg = <0x0>;

		csiphy-sd-index = <0>;

drivers/char/adsprpc.c

+8 −4
Original line number Diff line number Diff line
@@ -3622,22 +3622,26 @@ static int fastrpc_set_process_info(struct fastrpc_file *fl) 
{

	int err = 0, buf_size = 0;

	char strpid[PID_SIZE];

	char cur_comm[TASK_COMM_LEN];



	memcpy(cur_comm, current->comm, TASK_COMM_LEN);

	cur_comm[TASK_COMM_LEN-1] = '\0';

	fl->tgid = current->tgid;

	snprintf(strpid, PID_SIZE, "%d", current->pid);

	buf_size = strlen(current->comm) + strlen("_") + strlen(strpid) + 1;

	buf_size = strlen(cur_comm) + strlen("_") + strlen(strpid) + 1;

	fl->debug_buf = kzalloc(buf_size, GFP_KERNEL);

	if (!fl->debug_buf) {

		err = -ENOMEM;

		return err;

	}

	snprintf(fl->debug_buf, UL_SIZE, "%.10s%s%d",

			current->comm, "_", current->pid);

	snprintf(fl->debug_buf, buf_size, "%.10s%s%d",

			cur_comm, "_", current->pid);

	fl->debugfs_file = debugfs_create_file(fl->debug_buf, 0644,

					debugfs_root, fl, &debugfs_fops);

	if (!fl->debugfs_file)

		pr_warn("Error: %s: %s: failed to create debugfs file %s\n",

				current->comm, __func__, fl->debug_buf);

				cur_comm, __func__, fl->debug_buf);



	return err;

}

drivers/gpu/drm/msm/dp/dp_display.c

+0 −19
Original line number Diff line number Diff line
@@ -1053,25 +1053,6 @@ static int dp_display_set_mode(struct dp_display *dp_display, 
	mode->timing.bpp = dp->panel->get_mode_bpp(dp->panel,

			mode->timing.bpp, pixel_clk_khz);



	/* Refactor bits per pixel for YUV422 format */

	if (mode->timing.out_format == MSM_MODE_FLAG_COLOR_FORMAT_YCBCR422) {

		switch (mode->timing.bpp) {

		case 18:

			mode->timing.bpp = 24;

			break;

		case 24:

			mode->timing.bpp = 30;

			break;

		case 30:

			mode->timing.bpp = 36;

			break;

		default:

			mode->timing.bpp = 30;

			break;

		};

		pr_debug("YCC422 bpp = %d\n", mode->timing.bpp);

	}



	dp->panel->pinfo = mode->timing;

	dp->panel->init(dp->panel);

	mutex_unlock(&dp->session_lock);

drivers/gpu/msm/kgsl.c

+1 −1
Original line number Diff line number Diff line
@@ -263,9 +263,9 @@ kgsl_mem_entry_create(void) 
		kref_init(&entry->refcount);

		/* put this ref in userspace memory alloc and map ioctls */

		kref_get(&entry->refcount);

		atomic_set(&entry->map_count, 0);

	}



	atomic_set(&entry->map_count, 0);

	return entry;

}

#ifdef CONFIG_DMA_SHARED_BUFFER