Merge branch 'locking/core'

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/static_call.h
index e01b61ab86b10ffb5a435ae1562b2159cdab8909,8d50f62420ca64530b23a541d13b43cbc9437846..fc94faa53b5b16dce0bd757024d3a369a493b7c1
--- 1/include/linux/static_call.h
--- 2/include/linux/static_call.h
+++ b/include/linux/static_call.h
@@@ -118,13 -113,11 +118,13 @@@ extern void arch_static_call_transform(
  
  #define static_call_update(name, func)                                        \
  ({                                                                    \
-       BUILD_BUG_ON(!__same_type(*(func), STATIC_CALL_TRAMP(name)));   \
+       typeof(&STATIC_CALL_TRAMP(name)) __F = (func);                  \
        __static_call_update(&STATIC_CALL_KEY(name),                    \
-                            STATIC_CALL_TRAMP_ADDR(name), func);       \
+                            STATIC_CALL_TRAMP_ADDR(name), __F);        \
  })
  
 +#define static_call_query(name) (READ_ONCE(STATIC_CALL_KEY(name).func))
 +
  #ifdef CONFIG_HAVE_STATIC_CALL_INLINE
  
  extern int __init static_call_init(void);

diff --cc kernel/locking/lockdep.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge