Steps on the way to v7.1-rc1 Resolved merge conflicts in: include/linux/module.h kernel/module/main.c Cc: Siddharth Nayyar <sidnayyar@google.com> Cc: Will McVicker <willmcvicker@google.com> Change-Id: Ia9abf40b1600d5f67533e107e69d8c16979e2c71 Signed-off-by: Carlos Llamas <cmllamas@google.com>