netdev - Re: [PATCH 00/35] Netfilter/IPVS updates for net-next

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: <20151017133801.GA27406@salvia>
Date:	Sat, 17 Oct 2015 15:38:01 +0200
From:	Pablo Neira Ayuso <pablo@...filter.org>
To:	David Miller <davem@...emloft.net>
Cc:	netfilter-devel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 00/35] Netfilter/IPVS updates for net-next

On Sat, Oct 17, 2015 at 06:07:43AM -0700, David Miller wrote:
> From: Pablo Neira Ayuso <pablo@...filter.org>
> Date: Sat, 17 Oct 2015 13:32:35 +0200
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
> 
> Pablo, this gives merge conflicts.
> 
> This is the second or third time in the past few pulls from you that
> there have been merge conflicts, even when I haven't made a single
> change between when you sent the pull request and when I try to
> integrate it into my tree.

I was about to fix this here, sorry.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html