Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-03-14 11:57:34 -04:00
parent f65c7a4ccd
commit 9ba3a061c6
9 changed files with 21 additions and 54 deletions

View file

@ -8,7 +8,7 @@ Subject: [PATCH] allow SystemUI to directly manage Bluetooth/WiFi
1 file changed, 3 insertions(+)
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 6bee19745c87..ac231c5fafbe 100644
index c536b6cb94df..cf0607449054 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -78,6 +78,9 @@

View file

@ -10,7 +10,7 @@ Ported from 10: 5e2898e9d21dd6802bb0b0139e7e496c41e1cd80
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ee428371a016..0eff7ae9a0cd 100644
index 26fd27b7b5ff..2a79c6019fc1 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1607,7 +1607,7 @@

View file

@ -29,7 +29,7 @@ index 952ccdad992c..728c0e95ca6d 100644
field public static final String SENSORS = "android.permission-group.SENSORS";
field public static final String SMS = "android.permission-group.SMS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0eff7ae9a0cd..00351c340a1a 100644
index 2a79c6019fc1..e70e54b62f61 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1601,10 +1601,18 @@

View file

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 29 Dec 2021 11:25:29 -0500
Date: Sat, 12 Mar 2022 12:28:36 -0500
Subject: [PATCH] Merge remote-tracking branch 'qc/msm-4.9' into HEAD
Signed-off-by: Tad <tad@spotco.us>
@ -34,7 +34,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
.../trace-pagealloc-postprocess.pl | 2 +-
.../postprocess/trace-vmscan-postprocess.pl | 2 +-
Documentation/virtual/kvm/api.txt | 2 +
Makefile | 52 +-
Makefile | 50 +-
arch/alpha/include/asm/io.h | 8 +-
arch/alpha/include/asm/uaccess.h | 67 +-
arch/alpha/kernel/smp.c | 2 +-
@ -2558,7 +2558,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
lib/random32.c | 462 ++-
lib/seq_buf.c | 8 +-
lib/stackdepot.c | 6 +-
lib/string.c | 137 +-
lib/string.c | 113 +-
lib/swiotlb.c | 6 +-
lib/zlib_inflate/inffast.c | 91 +-
mm/backing-dev.c | 1 +
@ -3084,7 +3084,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
tools/testing/selftests/x86/syscall_nt.c | 1 +
tools/usb/usbip/libsrc/usbip_host_common.c | 2 +-
virt/kvm/kvm_main.c | 25 +-
3078 files changed, 41962 insertions(+), 15294 deletions(-)
3078 files changed, 41937 insertions(+), 15293 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/hall_sensor.txt
create mode 100644 Documentation/devicetree/bindings/input/misc/bma2x2.txt
create mode 100644 Documentation/devicetree/bindings/input/misc/ltr553.txt
@ -3837,7 +3837,7 @@ index d1908e50b506..b8f5bf2a890a 100644
__u64 evt_page;
__u64 msg_page;
diff --git a/Makefile b/Makefile
index 63c7cdc23d65..e61a3796a5ed 100644
index 73dd2ebec1f0..e61a3796a5ed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -3871,15 +3871,6 @@ index 63c7cdc23d65..e61a3796a5ed 100644
PERL = perl
PYTHON = python
CHECK = sparse
@@ -519,7 +515,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
endif
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
-CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
+CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
endif
ifneq ($(GCC_TOOLCHAIN),)
@@ -797,12 +793,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
# See modpost pattern 2
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
@ -113748,7 +113739,7 @@ index 759ff419fe61..c519aa07d2e9 100644
if (prealloc) {
/* Nobody used this memory, ok to free it. */
diff --git a/lib/string.c b/lib/string.c
index fbaca936f69c..9f4a98cd47e1 100644
index 9b2df9077a92..9f4a98cd47e1 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -157,11 +157,9 @@ EXPORT_SYMBOL(strlcpy);
@ -113779,34 +113770,10 @@ index fbaca936f69c..9f4a98cd47e1 100644
*/
ssize_t strscpy(char *dest, const char *src, size_t count)
{
@@ -235,6 +235,63 @@ ssize_t strscpy(char *dest, const char *src, size_t count)
EXPORT_SYMBOL(strscpy);
#endif
@@ -259,6 +259,39 @@ char *stpcpy(char *__restrict__ dest, const char *__restrict__ src)
}
EXPORT_SYMBOL(stpcpy);
+/**
+ * stpcpy - copy a string from src to dest returning a pointer to the new end
+ * of dest, including src's %NUL-terminator. May overrun dest.
+ * @dest: pointer to end of string being copied into. Must be large enough
+ * to receive copy.
+ * @src: pointer to the beginning of string being copied from. Must not overlap
+ * dest.
+ *
+ * stpcpy differs from strcpy in a key way: the return value is a pointer
+ * to the new %NUL-terminating character in @dest. (For strcpy, the return
+ * value is a pointer to the start of @dest). This interface is considered
+ * unsafe as it doesn't perform bounds checking of the inputs. As such it's
+ * not recommended for usage. Instead, its definition is provided in case
+ * the compiler lowers other libcalls to stpcpy.
+ */
+char *stpcpy(char *__restrict__ dest, const char *__restrict__ src);
+char *stpcpy(char *__restrict__ dest, const char *__restrict__ src)
+{
+ while ((*dest++ = *src++) != '\0')
+ /* nothing */;
+ return --dest;
+}
+EXPORT_SYMBOL(stpcpy);
+
+/**
+ * strscpy_pad() - Copy a C-string into a sized buffer
+ * @dest: Where to copy the string to
@ -113843,7 +113810,7 @@ index fbaca936f69c..9f4a98cd47e1 100644
#ifndef __HAVE_ARCH_STRCAT
/**
* strcat - Append one %NUL-terminated string to another
@@ -697,6 +754,72 @@ void memzero_explicit(void *s, size_t count)
@@ -721,6 +754,72 @@ void memzero_explicit(void *s, size_t count)
}
EXPORT_SYMBOL(memzero_explicit);