linux-kernel - Re: linux-next: build failure after merge of 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: <20150331.141315.2296740365869114033.davem@davemloft.net>
Date:	Tue, 31 Mar 2015 14:13:15 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	netdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, ben.hutchings@...ethink.co.uk
Subject: Re: linux-next: build failure after merge of the net-next tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 30 Mar 2015 15:05:34 +1100

> Caused by a bad merge between commits 1e9e39f4a298 ("usbnet: Fix
> tx_packets stat for FLAG_MULTI_FRAME drivers") and 7a1e890e2168
> ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm") form the
> net tree and commit 6588af614e7b ("usbnet: Fix tx_packets stat for
> FLAG_MULTI_FRAME drivers") from the net-next tree.  (Presumably,
> 6588af614e7b was cherry-picked as a bug fix.  So, Dave, something to
> watch for if you merge net into net-next.)

Thanks a lot for bringing this to my attention Stephen.
--
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/