Merge "modprobe: switch to getopt_long for argument parsing"