Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/traps.c
	arch/x86/power/cpu.c
	arch/x86/power/cpu_32.c
	kernel/Makefile

Semantic conflict:
	arch/x86/kernel/hw_breakpoint.c

Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
              put_cpu() in arch/x86/kernel/hw_breakpoint.c.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 14 deletions

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index bf1ab1a6790d..e639298bc9c8 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -785,18 +785,6 @@ static struct genl_ops netlbl_cipsov4_ops[] = {
  */
 int __init netlbl_cipsov4_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_cipsov4_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                &netlbl_cipsov4_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_cipsov4_gnl_family,
+                netlbl_cipsov4_ops, ARRAY_SIZE(netlbl_cipsov4_ops));
 }