From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Shuah Khan <shuahkh@osg•samsung.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Michael Ellerman <mpe@ellerman•id.au>,
stephen hemminger <stephen@networkplumber•org>
Subject: linux-next: manual merge of the net-next tree with the kselftest-fixes tree
Date: Wed, 3 Dec 2014 12:52:38 +1100 [thread overview]
Message-ID: <20141203125238.48fa7380@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1021 bytes --]
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 sfr@canb•auug.org.au
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-12-03 1:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141203125238.48fa7380@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=netdev@vger$(echo .)kernel.org \
--cc=shuahkh@osg$(echo .)samsung.com \
--cc=stephen@networkplumber$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox