Subject: linux-next: manual merge of the net-next tree with the kselftest-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Dec 2014 12:52:38 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/uapi/linux/Kbuild between commit 3f4994cfc15f ("kcmp: Move
kcmp.h into uapi") from the kselftest-fixes tree and commit
df32dd2054b6 ("uapi: resort Kbuild entries") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc include/uapi/linux/Kbuild
index d78fecf216bf,a1e8175cc488..000000000000
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -211,12 -211,11 +211,12 @@@ header-y += ivtv.
  header-y += ixjuser.h
  header-y += jffs2.h
  header-y += joystick.h
 +header-y += kcmp.h
- header-y += kd.h
  header-y += kdev_t.h
- header-y += kernel-page-flags.h
- header-y += kernel.h
+ header-y += kd.h
  header-y += kernelcapi.h
+ header-y += kernel.h
+ header-y += kernel-page-flags.h
  header-y += kexec.h
  header-y += keyboard.h
  header-y += keyctl.h