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

Merge branch 'android12-5.4' into branch 'android12-5.4-lts' 



This catches the android12-5.4-lts branch up with the latest changes in
the android12-5.4 branch.  Included in here are the following commits:

6f97bd95 ANDROID: 16K: Only check basename of linker context
4433e72c UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
dd432c37 ANDROID: ABI fixup for abi break in struct dst_ops
41a05cfc BACKPORT: net: fix __dst_negative_advice() race

Change-Id: I7c32d37343d9780c8ed56191ed733821e6fd5520
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a9bfcd21 6f97bd95
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment