linux-kernel - RE: linux-next: manual merge of the net-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1290247eb26c49229a7fcb49021a365f@BY2PR03MB299.namprd03.prod.outlook.com>
Date:	Thu, 5 Jun 2014 03:26:45 +0000
From:	KY Srinivasan <kys@...rosoft.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	David Miller <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Greg Kroah-Hartman" <gregkh@...uxfoundation.org>,
	stephen hemminger <stephen@...workplumber.org>
Subject: RE: linux-next: manual merge of the net-next tree with Linus' tree



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Wednesday, June 4, 2014 8:14 PM
> To: David Miller; netdev@...r.kernel.org
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; KY Srinivasan;
> Greg Kroah-Hartman; stephen hemminger
> Subject: linux-next: manual merge of the net-next tree with Linus' tree
> 
> 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).

Thanks Stephen.

Regards,

K. Y
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/