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

Merge 8c2c8445 ("netfilter: IDLETIMER: Fix for possible ABBA deadlock") into android15-6.6-lts



Steps on the way to 6.6.67

Resolves merge conflicts in:
	net/netfilter/xt_IDLETIMER.c
by merging away this commit as it breaks CTS testing due to massive
xt_IDLETIMER.c changes in the Android tree.

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