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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Sat, 17 Oct 2015 06:07:43 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	pablo@...filter.org
Cc:	netfilter-devel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 00/35] Netfilter/IPVS updates for net-next

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.

If you can't be certain there won't be merge conflicts, do a test
pull into a clone of my tree to see what happens.

Or, if you think the merge conflict is simple enough for me to deal
with, mention and explain it in the header posting for the patch
series.

Please fix this up and resend your pull request.

Thanks.
--
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

Powered by blists - more mailing lists