shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'ASB-2022-10-01_13-5.10' of https://android.googlesource.com/kernel/common

Browse Source 
https://source.android.com/docs/security/bulletin/2022-10-01
CVE-2022-1786
CVE-2022-20421
CVE-2022-20422
CVE-2022-20423
CVE-2022-20409

* tag 'ASB-2022-10-01_13-5.10': (68 commits)
  UPSTREAM: crypto: jitter - add oversampling of noise source
  ANDROID: Update the ABI representation
  FROMGIT: f2fs: support recording stop_checkpoint reason into super_block
  ANDROID: Update the ABI representation
  ANDROID: Fix for kernelci !CONFIG_SMP break-breaks
  ANDROID: fuse-bpf: set error_in to ENOENT in negative lookup
  ANDROID: fuse-bpf: Add ability to run ranges of tests to fuse_test
  BACKPORT: NFC: netlink: fix sleep in atomic bug when firmware download timeout
  ANDROID: KVM: arm64: Initialize ptr auth in protected mode
  ANDROID: cgroup: Add vendor hook for rebuild_root_domains_bypass
  FROMGIT: KVM: arm64: Ignore kvm-arm.mode if !is_hyp_mode_available()
  ANDROID: Update the ABI symbol list and xml
  UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie
  UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast
  UPSTREAM: wifi: mac80211_hwsim: fix race condition in pending packet
  ANDROID: Update the ABI representation
  ANDROID: sched: Fix off-by-one with cpupri MAX_RT_PRIO evaluation
  Revert "ANDROID: workqueue: add vendor hook for wq lockup information"
  UPSTREAM: kernel/irq: export irq_gc_set_wake
  ANDROID: Update the ABI representation
  ...

Change-Id: I0e90348befd683d679799deb2b2f0bf738dbc99f

Conflicts:
	sound/soc/codecs/hdmi-codec.c
This commit is contained in:
Tao Huang
2022-11-14 19:57:02 +08:00
parent bcc6783530 befd3e393e
commit 83af44e01c
99 changed files with 6542 additions and 2672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/workqueue.c
View File

@@ -55,7 +55,6 @@
#include "workqueue_internal.h"
#include <trace/hooks/wqlockup.h>
#include <trace/hooks/workqueue.h>
/* events/workqueue.h uses default TRACE_INCLUDE_PATH */
#undef TRACE_INCLUDE_PATH
@@ -5855,7 +5854,6 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
pr_cont_pool_info(pool);
pr_cont(" stuck for %us!\n",
jiffies_to_msecs(now - pool_ts) / 1000);
trace_android_vh_wq_lockup_pool(pool->cpu, pool_ts);
}
}