Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/bpf_parser.y b/bpf_parser.y
index 003c031..7331cc5 100644
--- a/bpf_parser.y
+++ b/bpf_parser.y
@@ -745,7 +745,7 @@ int compile_filter(char *file, int verbose, int bypass, int format,
 	memset(tmp_file, 0, sizeof(tmp_file));
 
 	if (invoke_cpp) {
-		ret = cpp_exec(file, tmp_file, sizeof(tmp_file));
+		ret = cpp_exec(file, tmp_file, sizeof(tmp_file), NULL);
 		if (ret) {
 			fprintf(stderr, "Failed to invoke C preprocessor!\n");
 			goto exit;