Merge "lib/list_sort: fix function type mismatches"

#include <linux/list.h>

typedef int __attribute__((nonnull(2,3))) (*cmp_func)(void *,

		struct list_head const *, struct list_head const *);

		struct list_head *, struct list_head *);

/*

 * Returns a list organized in an intermediate format suited

		if (likely(bits)) {

			struct list_head *a = *tail, *b = a->prev;

			a = merge(priv, (cmp_func)cmp, b, a);

			a = merge(priv, cmp, b, a);

			/* Install the merged result in place of the inputs */

			a->prev = b->prev;

			*tail = a;

		if (!next)

			break;

		list = merge(priv, (cmp_func)cmp, pending, list);

		list = merge(priv, cmp, pending, list);

		pending = next;

	}

	/* The final merge, rebuilding prev links */