merge problems with char-misc-next and Linus's branch right now

Hi,

I'm trying to push out a pull request for char-misc-next right now, and
am having merge issues that I need/want to fix up (or at least provide a
hint as to fix up.)

I'm currently stuck at the following build error:

  RUSTC     drivers/android/binder/rust_binder_main.o
error[E0425]: cannot find value `THIS_MODULE` in the crate root
  --> drivers/android/binder/netlink.rs:16:13
   |
16 |     &crate::THIS_MODULE,
   |             ^^^^^^^^^^^
   |
  ::: rust/kernel/module.rs:52:1
   |
52 | pub const fn this_module<M: ModuleMetadata>() -> &'static ThisModule {
   | -------------------------------------------------------------------- similarly named function `this_module` defined here
   |
help: a function with a similar name exists
   |
16 -     &crate::THIS_MODULE,
16 +     &crate::this_module,
   |

error: aborting due to 1 previous error


I wasn't paying attention to the recent THIS_MODULE changes, and can't
seem to figure out how to fix up the netlink.rs file to build with the
recent changes.

Any hints?

thanks,

greg k-h