Commit d78ad91b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



Sync the android14-5.15 branch up with android14-5.15-lts.  Contains the
following commits:

* 42528b83 ANDROID: GKI: Update symbol list for Pixel Watch
* d94e1657 Revert^2 "BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST ..."
* 81d41dd6 Merge tag 'android14-5.15.149_r00' into branch android14-5.15
* 73bef215 UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* 58719dc9 UPSTREAM: netlink: hold nlk->cb_mutex longer in __netlink_dump_start()
* e94d70c7 UPSTREAM: netlink: annotate data-races around sk->sk_err
* c0e59dab UPSTREAM: netlink: annotate lockless accesses to nlk->max_recvmsg_len
* 8d122b23 ANDROID: incremental-fs: Make work with 16k pages
* b7d4cf60 Revert "BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST ..."
* acacba8b BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST to be relative against objtree.
* d19f3c55 ANDROID: export one function for mm metrics
* de30e28b FROMLIST: usb: typec: tcpm: Ignore received Hard Reset in TOGGLING state

Change-Id: I9004e7ebd970391285db18535594edcbafa7f145
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8517b7fa 42528b83
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment