Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / tools / include / asm-generic / bitops / __fls.h

diff --git a/tools/include/asm-generic/bitops/__fls.h b/tools/include/asm-generic/bitops/__fls.h
index a60a7ccb6782d869b9d47503a158f86a92b84374..03f721a8a2b1993734e458399a68848637112c87 100644 (file)
--- a/tools/include/asm-generic/bitops/__fls.h
+++ b/tools/include/asm-generic/bitops/__fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS___FLS_H_
 #define _ASM_GENERIC_BITOPS___FLS_H_