From: Pablo Neira Ayuso
Date: Sat, 17 Oct 2015 15:48:50 +0200
> This is exactly the same pull request, including the conflict
> resolution for net/bridge/br_netfilter_hooks.c.
Pulled, thanks Pablo.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to m
On Sat, Oct 17, 2015 at 06:07:43AM -0700, David Miller wrote:
> From: Pablo Neira Ayuso
> 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 fe
From: Pablo Neira Ayuso
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 mad
