Messages in this thread | | | Date | Tue, 25 Nov 2014 09:23:52 -0200 | From | Marcelo Ricardo Leitner <> | Subject | Re: linux-next: manual merge of the net-next tree with the vfs tree |
| |
On 25-11-2014 00:42, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > net/netfilter/nf_log.c between commit e71456ae9871 ("netfilter: Remove > checks of seq_printf() return values") from the vfs tree and commit > 0c26ed1c07f1 ("netfilter: nf_log: Introduce nft_log_dereference() > macro") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). >
Looks good to me, thanks Stephen.
Marcelo
| |