diff for duplicates of <20120310160153.1d3e5f19@nehalam.linuxnetplumber.net> diff --git a/a/1.txt b/N1/1.txt index 14fe1f5..b7a3b95 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -90,7 +90,8 @@ Supersedes patch from Dan Carpenter --- a/drivers/net/ethernet/intel/igbvf/netdev.c 2012-02-24 10:04:00.123237028 -0800 +++ b/drivers/net/ethernet/intel/igbvf/netdev.c 2012-03-10 15:53:41.949194426 -0800 @@ -55,6 +55,11 @@ static const char igbvf_driver_string[] - static const char igbvf_copyright[] "Copyright (c) 2009 - 2012 Intel Corporation."; + static const char igbvf_copyright[] = + "Copyright (c) 2009 - 2012 Intel Corporation."; +#define DEFAULT_DEBUG_LEVEL_SHIFT 3 +static int debug = DEFAULT_DEBUG_LEVEL_SHIFT; diff --git a/a/content_digest b/N1/content_digest index 41281dc..feb9817 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120310084921.GA4647@elgon.mountain\0" "From\0Stephen Hemminger <shemminger@vyatta.com>\0" "Subject\0[PATCH] intel: make wired ethernet driver message level consistent\0" - "Date\0Sun, 11 Mar 2012 00:01:53 +0000\0" + "Date\0Sat, 10 Mar 2012 16:01:53 -0800\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Jeff Kirsher <jeffrey.t.kirsher@intel.com>" Jesse Brandeburg <jesse.brandeburg@intel.com> @@ -110,7 +110,8 @@ "--- a/drivers/net/ethernet/intel/igbvf/netdev.c\t2012-02-24 10:04:00.123237028 -0800\n" "+++ b/drivers/net/ethernet/intel/igbvf/netdev.c\t2012-03-10 15:53:41.949194426 -0800\n" "@@ -55,6 +55,11 @@ static const char igbvf_driver_string[]\n" - " static const char igbvf_copyright[] \t\t \"Copyright (c) 2009 - 2012 Intel Corporation.\";\n" + " static const char igbvf_copyright[] =\n" + " \t\t \"Copyright (c) 2009 - 2012 Intel Corporation.\";\n" " \n" "+#define DEFAULT_DEBUG_LEVEL_SHIFT 3\n" "+static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;\n" @@ -177,4 +178,4 @@ " \t/*\n" " \t * call save state here in standalone driver because it relies on" -6e2ee7ca718852ea9b017895c181586db9a722f83175163478dbe2eebfb9e13d +21b54fa30ac60a0f60ca016c691e66c98e91470f666a417079fb54249dd66a44
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.