linux-kernel - Re: linux-next: manual merge of the staging tree with the net-next 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <87ob0rsbcq.fsf@x220.int.ebiederm.org>
Date:	Thu, 27 Mar 2014 12:14:13 -0700
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, David Miller <davem@...emloft.net>,
	<netdev@...r.kernel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Mathieu Maret <mathieu.maret@...il.com>,
	Jelena Bjelja <jelena.bjelja.ing@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the net-next tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/wlags49_h2/wl_netdev.c between commit 8d4ade284a41
> ("wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb")
> from the net-next tree and commit fed3ffd8f7ef ("staging: wlags49_h2:
> reindent wl_netdev.c") (and maybe others) from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

That looks like the correct resolution.  Thanks,

Eric

--
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/