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

Commit 213d6fcf authored by Ashwini Muduganti's avatar Ashwini Muduganti
Browse files

Merge 85403480 on remote branch 



Conflicts:
	include/linux/cpu.h
	kernel/stop_machine.c

Change-Id: I638f7cf70e4b6b71a6a11bf6486d47a0d0fcc4af
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
parents ef6d453f 6a2de27b

Documentation/hwmon/ina2xx

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Supported chips: 
    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/



Author: Lothar Felten <l-felten@ti.com>

Author: Lothar Felten <lothar.felten@gmail.com>



Description

-----------

Documentation/networking/ip-sysctl.txt

+5 −8
Original line number Diff line number Diff line
@@ -133,14 +133,11 @@ min_adv_mss - INTEGER 


IP Fragmentation:



ipfrag_high_thresh - INTEGER

	Maximum memory used to reassemble IP fragments. When

	ipfrag_high_thresh bytes of memory is allocated for this purpose,

	the fragment handler will toss packets until ipfrag_low_thresh

	is reached. This also serves as a maximum limit to namespaces

	different from the initial one.



ipfrag_low_thresh - INTEGER

ipfrag_high_thresh - LONG INTEGER

	Maximum memory used to reassemble IP fragments.



ipfrag_low_thresh - LONG INTEGER

	(Obsolete since linux-4.17)

	Maximum memory used to reassemble IP fragments before the kernel

	begins to remove incomplete fragment queues to free up resources.

	The kernel still accepts new fragments for defragmentation.

Makefile

+8 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 66

SUBLEVEL = 74

EXTRAVERSION =

NAME = Petit Gorille
@@ -357,9 +357,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 
	  else if [ -x /bin/bash ]; then echo /bin/bash; \

	  else echo sh; fi ; fi)



HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS)

HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS)

HOST_LFS_LIBS := $(shell getconf LFS_LIBS)

HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)

HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)

HOST_LFS_LIBS := $(shell getconf LFS_LIBS 2>/dev/null)



HOSTCC       = gcc

HOSTCXX      = g++
@@ -501,9 +501,13 @@ KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) 
endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register

RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk

RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline

RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS



ifeq ($(config-targets),1)

# ===========================================================================

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,9 @@ config HAVE_ARCH_JUMP_LABEL 
config HAVE_RCU_TABLE_FREE

	bool



config HAVE_RCU_TABLE_INVALIDATE

	bool



config ARCH_HAVE_NMI_SAFE_CMPXCHG

	bool

arch/alpha/kernel/osf_sys.c

+24 −27
Original line number Diff line number Diff line
@@ -530,24 +530,19 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path, 
SYSCALL_DEFINE1(osf_utsname, char __user *, name)

{

	int error;

	char tmp[5 * 32];



	down_read(&uts_sem);

	error = -EFAULT;

	if (copy_to_user(name + 0, utsname()->sysname, 32))

		goto out;

	if (copy_to_user(name + 32, utsname()->nodename, 32))

		goto out;

	if (copy_to_user(name + 64, utsname()->release, 32))

		goto out;

	if (copy_to_user(name + 96, utsname()->version, 32))

		goto out;

	if (copy_to_user(name + 128, utsname()->machine, 32))

		goto out;



	error = 0;

 out:

	memcpy(tmp + 0 * 32, utsname()->sysname, 32);

	memcpy(tmp + 1 * 32, utsname()->nodename, 32);

	memcpy(tmp + 2 * 32, utsname()->release, 32);

	memcpy(tmp + 3 * 32, utsname()->version, 32);

	memcpy(tmp + 4 * 32, utsname()->machine, 32);

	up_read(&uts_sem);

	return error;



	if (copy_to_user(name, tmp, sizeof(tmp)))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE0(getpagesize)
@@ -567,18 +562,21 @@ SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen) 
{

	int len, err = 0;

	char *kname;

	char tmp[32];



	if (namelen > 32)

	if (namelen < 0 || namelen > 32)

		namelen = 32;



	down_read(&uts_sem);

	kname = utsname()->domainname;

	len = strnlen(kname, namelen);

	if (copy_to_user(name, kname, min(len + 1, namelen)))

		err = -EFAULT;

	len = min(len + 1, namelen);

	memcpy(tmp, kname, len);

	up_read(&uts_sem);



	return err;

	if (copy_to_user(name, tmp, len))

		return -EFAULT;

	return 0;

}



/*
@@ -739,13 +737,14 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	};

	unsigned long offset;

	const char *res;

	long len, err = -EINVAL;

	long len;

	char tmp[__NEW_UTS_LEN + 1];



	offset = command-1;

	if (offset >= ARRAY_SIZE(sysinfo_table)) {

		/* Digital UNIX has a few unpublished interfaces here */

		printk("sysinfo(%d)", command);

		goto out;

		return -EINVAL;

	}



	down_read(&uts_sem);
@@ -753,13 +752,11 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	len = strlen(res)+1;

	if ((unsigned long)len > (unsigned long)count)

		len = count;

	if (copy_to_user(buf, res, len))

		err = -EFAULT;

	else

		err = 0;

	memcpy(tmp, res, len);

	up_read(&uts_sem);

 out:

	return err;

	if (copy_to_user(buf, tmp, len))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,