From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"K. Y. Srinivasan" <kys@microsoft.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stephen hemminger <stephen@networkplumber.org>
Subject: linux-next: manual merge of the net-next tree with Linus' tree
Date: Thu, 5 Jun 2014 13:13:59 +1000 [thread overview]
Message-ID: <20140605131359.771694b6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
Eliminate the channel spinlock in the callback path") from Linus' tree
and commit 1b9d48f2a579 ("hyper-v: make uuid_le const") 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 drivers/hv/channel_mgmt.c
index 6c8b032cacba,90d654556437..000000000000
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@@ -404,7 -365,7 +404,7 @@@ static u32 next_vp
* performance critical channels (IDE, SCSI and Network) will be uniformly
* distributed across all available CPUs.
*/
- static void init_vp_index(struct vmbus_channel *channel, uuid_le *type_guid)
-static u32 get_vp_index(const uuid_le *type_guid)
++static void init_vp_index(struct vmbus_channel *channel, const uuid_le *type_guid)
{
u32 cur_cpu;
int i;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"K. Y. Srinivasan" <kys@microsoft.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stephen hemminger <stephen@networkplumber.org>
Subject: linux-next: manual merge of the net-next tree with Linus' tree
Date: Thu, 5 Jun 2014 13:13:59 +1000 [thread overview]
Message-ID: <20140605131359.771694b6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
Eliminate the channel spinlock in the callback path") from Linus' tree
and commit 1b9d48f2a579 ("hyper-v: make uuid_le const") 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 drivers/hv/channel_mgmt.c
index 6c8b032cacba,90d654556437..000000000000
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@@ -404,7 -365,7 +404,7 @@@ static u32 next_vp
* performance critical channels (IDE, SCSI and Network) will be uniformly
* distributed across all available CPUs.
*/
- static void init_vp_index(struct vmbus_channel *channel, uuid_le *type_guid)
-static u32 get_vp_index(const uuid_le *type_guid)
++static void init_vp_index(struct vmbus_channel *channel, const uuid_le *type_guid)
{
u32 cur_cpu;
int i;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-05 3:14 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-05 3:13 Stephen Rothwell [this message]
2014-06-05 3:13 ` linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell
2014-06-05 3:26 ` KY Srinivasan
-- strict thread matches above, loose matches on Subject: below --
2023-12-14 23:52 Stephen Rothwell
2023-02-16 23:40 Stephen Rothwell
2023-02-16 23:18 Stephen Rothwell
2022-10-27 23:28 Stephen Rothwell
2022-10-28 6:53 ` Marc Kleine-Budde
2022-09-21 1:00 Stephen Rothwell
2022-09-21 4:40 ` Colin Foster
2022-07-15 2:01 Stephen Rothwell
2022-07-15 1:48 Stephen Rothwell
2021-07-23 2:32 Stephen Rothwell
2021-01-29 0:59 Stephen Rothwell
2021-01-29 0:48 Stephen Rothwell
2021-01-29 0:43 Stephen Rothwell
2019-10-21 0:07 Stephen Rothwell
2019-09-15 20:31 Mark Brown
2019-09-15 20:24 Mark Brown
2019-06-17 1:44 Stephen Rothwell
2019-06-04 0:30 Stephen Rothwell
2019-06-04 0:29 Stephen Rothwell
2019-04-02 22:56 Stephen Rothwell
2018-07-20 1:49 Stephen Rothwell
2018-06-06 4:37 Stephen Rothwell
2017-12-04 22:59 Stephen Rothwell
2017-11-09 23:31 Stephen Rothwell
2017-11-10 4:37 ` Cong Wang
2017-11-10 4:39 ` David Miller
2017-10-30 17:24 Mark Brown
2017-10-30 17:08 Mark Brown
2017-10-30 17:02 Mark Brown
2017-10-30 17:02 ` Mark Brown
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 18:10 ` Mark Brown
2017-10-30 18:10 ` Mark Brown
2017-06-30 0:57 Stephen Rothwell
2017-05-03 1:07 Stephen Rothwell
2017-05-03 4:08 ` David Miller
2017-03-24 0:05 Stephen Rothwell
2017-03-24 0:10 ` David Miller
2017-03-24 1:24 ` Alexei Starovoitov
2017-03-24 1:24 ` Alexei Starovoitov
2017-02-02 1:49 Stephen Rothwell
2017-02-02 8:40 ` Yotam Gigi
2016-10-02 22:37 Stephen Rothwell
2016-10-02 22:32 Stephen Rothwell
2016-06-30 1:01 Stephen Rothwell
2016-06-30 1:01 ` Stephen Rothwell
2016-05-03 3:15 Stephen Rothwell
2016-05-03 3:15 ` Stephen Rothwell
2016-03-15 0:07 Stephen Rothwell
2016-03-15 0:07 ` Stephen Rothwell
2016-03-15 8:53 ` Gregory CLEMENT
2016-03-15 8:53 ` Gregory CLEMENT
2015-07-14 1:46 Stephen Rothwell
2015-07-14 1:46 ` Stephen Rothwell
2015-07-14 8:23 ` Nikolay Aleksandrov
2015-05-28 4:17 Stephen Rothwell
2015-05-28 4:17 ` Stephen Rothwell
2015-05-28 13:34 ` Tom Lendacky
2015-05-28 13:34 ` Tom Lendacky
2015-02-12 1:05 Stephen Rothwell
2015-02-12 1:05 ` Stephen Rothwell
2014-06-12 2:01 Stephen Rothwell
2014-06-12 2:01 ` Stephen Rothwell
2013-12-18 1:46 Stephen Rothwell
2013-12-18 1:46 ` Stephen Rothwell
2013-12-18 1:56 ` Jeff Kirsher
2013-12-18 2:19 ` Stephen Rothwell
2013-09-05 5:23 Stephen Rothwell
2013-09-05 5:23 ` Stephen Rothwell
2013-09-05 5:19 Stephen Rothwell
2013-09-05 5:19 ` Stephen Rothwell
2013-09-05 7:33 ` Daniel Borkmann
2013-09-02 3:12 Stephen Rothwell
2013-09-02 3:12 ` Stephen Rothwell
2013-06-17 2:44 Stephen Rothwell
2013-06-17 2:44 ` Stephen Rothwell
2013-06-17 2:38 Stephen Rothwell
2013-06-17 2:38 ` Stephen Rothwell
2013-04-22 3:09 Stephen Rothwell
2013-04-22 3:09 ` Stephen Rothwell
2013-04-23 0:42 ` David Miller
2013-04-22 3:03 Stephen Rothwell
2013-04-22 3:03 ` Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-04-22 2:48 Stephen Rothwell
2013-04-22 2:48 ` Stephen Rothwell
2013-04-22 2:43 Stephen Rothwell
2013-04-22 2:43 ` Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-03-27 0:57 Stephen Rothwell
2013-03-27 0:57 ` Stephen Rothwell
2013-03-27 4:54 ` David Miller
2013-03-12 0:33 Stephen Rothwell
2013-03-12 0:33 ` Stephen Rothwell
2013-03-12 10:49 ` David Miller
2012-11-08 23:53 Stephen Rothwell
2012-11-08 23:53 ` Stephen Rothwell
2012-11-10 23:34 ` David Miller
2012-10-02 1:51 Stephen Rothwell
2012-10-02 1:51 ` Stephen Rothwell
2012-09-26 1:46 Stephen Rothwell
2012-09-26 1:46 ` Stephen Rothwell
2012-07-19 1:15 Stephen Rothwell
2012-07-19 1:15 ` Stephen Rothwell
2012-07-19 1:18 ` Jeff Kirsher
2012-02-27 1:11 Stephen Rothwell
2012-02-27 1:11 ` Stephen Rothwell
2012-02-27 4:05 ` David Miller
2012-02-29 3:21 ` Ben Hutchings
2012-02-29 3:21 ` Ben Hutchings
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=20140605131359.771694b6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.