From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Alexander Aring <alex.aring@gmail•com>,
Marcel Holtmann <marcel@holtmann•org>
Subject: linux-next: manual merge of the driver-core tree with the wireless-next tree
Date: Mon, 10 Nov 2014 15:34:26 +1100 [thread overview]
Message-ID: <20141110153426.616e1f19@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/ieee802154/fakehard.c between commit 36426484fcac
("ieee802154: remove fakehard driver") from the wireless-next tree and
commit bb1f1107858c ("net: ieee802154: drop owner assignment from
platform_drivers") from the driver-core tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-11-10 4:34 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=20141110153426.616e1f19@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.aring@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=marcel@holtmann$(echo .)org \
--cc=wsa@the-dreams$(echo .)de \
/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