diff for duplicates of <20120924235457.GA31372@google.com> diff --git a/a/1.txt b/N1/1.txt index 18e01cc..5b84c4c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,7 +69,7 @@ index 0e33754..b6ceeee 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -600,7 +600,7 @@ char *resource_string(char *buf, char *end, struct resource *res, - * 64-bit res (sizeof=8): 20 chars in dec, 18 in hex ("0x" + 16) */ + * 64-bit res (sizeof==8): 20 chars in dec, 18 in hex ("0x" + 16) */ #define RSRC_BUF_SIZE ((2 * sizeof(resource_size_t)) + 4) #define FLAG_BUF_SIZE (2 * sizeof(res->flags)) -#define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]") @@ -158,6 +158,6 @@ index 81b88bd..9f9e31a 100644 continue; + if (r->flags & IORESOURCE_UNSET) + continue; - if ((i = PCI_ROM_RESOURCE) && + if ((i == PCI_ROM_RESOURCE) && (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; diff --git a/a/content_digest b/N1/content_digest index 8de0733..a03903b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\020120924190912.Horde.qznUIqGZi1VQYJO46HeGkwA@webmail.df.eu\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [RFC/PATCH v2] ia64, SR870, EFI bug breaks ata_piix, uninitialized ICH4 IDE EXBAR mem resource\0" - "Date\0Mon, 24 Sep 2012 23:54:57 +0000\0" + "Date\0Mon, 24 Sep 2012 17:54:57 -0600\0" "To\0Stephan Schreiber <info@fs-driver.org>\0" "Cc\0Alan Cox <alan@lxorguk.ukuu.org.uk>" linux-ia64@vger.kernel.org @@ -87,7 +87,7 @@ "--- a/lib/vsprintf.c\n" "+++ b/lib/vsprintf.c\n" "@@ -600,7 +600,7 @@ char *resource_string(char *buf, char *end, struct resource *res,\n" - " \t * 64-bit res (sizeof=8): 20 chars in dec, 18 in hex (\"0x\" + 16) */\n" + " \t * 64-bit res (sizeof==8): 20 chars in dec, 18 in hex (\"0x\" + 16) */\n" " #define RSRC_BUF_SIZE\t\t((2 * sizeof(resource_size_t)) + 4)\n" " #define FLAG_BUF_SIZE\t\t(2 * sizeof(res->flags))\n" "-#define DECODED_BUF_SIZE\tsizeof(\"[mem - 64bit pref window disabled]\")\n" @@ -176,8 +176,8 @@ " \t\t\tcontinue;\n" "+\t\tif (r->flags & IORESOURCE_UNSET)\n" "+\t\t\tcontinue;\n" - " \t\tif ((i = PCI_ROM_RESOURCE) &&\n" + " \t\tif ((i == PCI_ROM_RESOURCE) &&\n" " \t\t\t\t(!(r->flags & IORESOURCE_ROM_ENABLE)))\n" " \t\t\tcontinue;" -d5a04ad1161ba1e4282262767969e98cbeb0b15537eeb41915f8d7aa1242711f +fe56c7dc4bba3c52c5387cf88cc9043209c86a76eb5026060b283ef06e5201f8
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.