diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:41 +0000 |
| commit | 0ba734da84436041f8ca3ee848e32353b09eaba7 (patch) | |
| tree | 971fb38bd06c119bcb620b092c712edbc8a56e5c | |
| parent | 09e24327bcaaaa9dbaa8c7c8e69ded6daaa1ce63 (diff) | |
| parent | 29a914a53a1012c86fa3915d9ac30096375939f9 (diff) | |
| download | common-patches-0ba734da84436041f8ca3ee848e32353b09eaba7.tar.gz | |
Merge "aosp/android-mainline: update series (rebase onto v6.7-rc8-123-g3eca89454aec4)" into main
4 files changed, 8 insertions, 8 deletions
diff --git a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch index abb52562..187cfc95 100644 --- a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch +++ b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch @@ -230,7 +230,7 @@ new file mode 100644 diff --git a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -10375,6 +10375,13 @@ F: Documentation/hwmon/ina2xx.rst +@@ -10374,6 +10374,13 @@ F: Documentation/hwmon/ina2xx.rst F: drivers/hwmon/ina2xx.c F: include/linux/platform_data/ina2xx.h diff --git a/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch b/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch index fadf3e59..ae0ca3e2 100644 --- a/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch +++ b/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch @@ -107,7 +107,7 @@ diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c .proxy_ndp = 0, .accept_source_route = 0, /* we do not accept RH0 by default. */ .disable_ipv6 = 0, -@@ -2410,6 +2412,26 @@ static void ipv6_gen_rnd_iid(struct in6_addr *addr) +@@ -2402,6 +2404,26 @@ static void ipv6_gen_rnd_iid(struct in6_addr *addr) goto regen; } @@ -134,7 +134,7 @@ diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c /* * Add prefix route. */ -@@ -2420,7 +2442,7 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, u32 metric, +@@ -2412,7 +2434,7 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, u32 metric, u32 flags, gfp_t gfp_flags) { struct fib6_config cfg = { @@ -143,7 +143,7 @@ diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c .fc_metric = metric ? : IP6_RT_PRIO_ADDRCONF, .fc_ifindex = dev->ifindex, .fc_expires = expires, -@@ -2455,7 +2477,7 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx, +@@ -2447,7 +2469,7 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx, struct fib6_node *fn; struct fib6_info *rt = NULL; struct fib6_table *table; @@ -152,7 +152,7 @@ diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c table = fib6_get_table(dev_net(dev), tb_id); if (!table) -@@ -6895,6 +6917,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -6887,6 +6909,13 @@ static const struct ctl_table addrconf_sysctl[] = { }, #endif #endif diff --git a/android-mainline/NOUPSTREAM-ANDROID-Add-vendor-hooks-to-the-scheduler.patch b/android-mainline/NOUPSTREAM-ANDROID-Add-vendor-hooks-to-the-scheduler.patch index 635a1f3c..d7dfcc45 100644 --- a/android-mainline/NOUPSTREAM-ANDROID-Add-vendor-hooks-to-the-scheduler.patch +++ b/android-mainline/NOUPSTREAM-ANDROID-Add-vendor-hooks-to-the-scheduler.patch @@ -1152,7 +1152,7 @@ diff --git a/net/core/sock.c b/net/core/sock.c #include <net/tcp.h> #include <net/busy_poll.h> -@@ -3334,9 +3335,19 @@ void sock_def_readable(struct sock *sk) +@@ -3342,9 +3343,19 @@ void sock_def_readable(struct sock *sk) rcu_read_lock(); wq = rcu_dereference(sk->sk_wq); diff --git a/android-mainline/series b/android-mainline/series index f4327513..6828503d 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -1,8 +1,8 @@ # # android-mainline patches # -# Applies onto upstream 08bd31ece0820 Linux v6.7-rc8-53-g08bd31ece0820 -# Matches android-mainline 818858f54a3c1 ("Merge 08bd31ece082 ("Merge tag 'sound-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline") +# Applies onto upstream 3eca89454aec4 Linux v6.7-rc8-123-g3eca89454aec4 +# Matches android-mainline bf7cf4b92c292 ("Merge 3eca89454aec ("Merge tag '6.7-rc8-smb3-mchan-fixes' of git://git.samba.org/sfrench/cifs-2.6") into android-mainline") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch |