There were a few conflicts that are fairly easy to resolve.
Signed-off-by: NNeilBrown <neilb@suse.com>