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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <522833B6.2040804@redhat.com>
Date:	Thu, 05 Sep 2013 09:33:10 +0200
From:	Daniel Borkmann <dborkman@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree

On 09/05/2013 07:19 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/bridge/br_multicast.c between commit 2d98c29b6fb3 ("net: bridge:
> convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus'
> tree and commit e3f5b17047de ("net: ipv6: mld: get rid of MLDV2_MRC and
> simplify calculation") from the net-next tree.
>
> I just used the net-next tree version and can carry the fix as necessary
> (no action is required).

Sounds good thanks 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/