Merge d823265dd4 ("Merge branch 'ice-pfcp-filter'") into android-mainline

Steps on the way to 6.10-rc1 Change-Id: Ied69623b0e9c834a3637a9c4ac2ac374ddfd4d84 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2024-07-26 05:56:53 +00:00
parent 6aac150745 d823265dd4
commit a51574799d
104 changed files with 2094 additions and 727 deletions
@@ -1180,8 +1180,6 @@ parse_probe_arg(char *arg, const struct fetch_type *type,
 	return ret;
 }

-#define BYTES_TO_BITS(nb)	((BITS_PER_LONG * (nb)) / sizeof(long))
-
 /* Bitfield type needs to be parsed into a fetch function */
 static int __parse_bitfield_probe_arg(const char *bf,
 				      const struct fetch_type *t,