diff for duplicates of <1293074547.9820.367.camel@dan> diff --git a/a/1.txt b/N1/1.txt index 8f58d39..1cff154 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,7 +53,7 @@ index f85da07..be3afde 100644 @@ -218,7 +218,7 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc) { if (!vcc->dev) - seq_printf(seq, sizeof(void *) = 4 ? + seq_printf(seq, sizeof(void *) == 4 ? - "N/A@%p%10s" : "N/A@%p%2s", vcc, ""); + "N/A@%pK%10s" : "N/A@%pK%2s", vcc, ""); else @@ -195,7 +195,7 @@ index d87c22d..cf00ddf 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3643,7 +3643,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v) - if (v = SEQ_START_TOKEN) + if (v == SEQ_START_TOKEN) seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else - seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n", diff --git a/a/content_digest b/N1/content_digest index 6dadf7b..b0f206b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Rosenberg <drosenberg@vsecurity.com>\0" "Subject\0[PATCH] Convert net %p usage %pK\0" - "Date\0Thu, 23 Dec 2010 03:22:27 +0000\0" + "Date\0Wed, 22 Dec 2010 22:22:27 -0500\0" "To\0linux-kernel@vger.kernel.org" netdev@vger.kernel.org " linux-sctp@vger.kernel.org\0" @@ -85,7 +85,7 @@ "@@ -218,7 +218,7 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)\n" " {\n" " \tif (!vcc->dev)\n" - " \t\tseq_printf(seq, sizeof(void *) = 4 ?\n" + " \t\tseq_printf(seq, sizeof(void *) == 4 ?\n" "-\t\t\t \"N/A@%p%10s\" : \"N/A@%p%2s\", vcc, \"\");\n" "+\t\t\t \"N/A@%pK%10s\" : \"N/A@%pK%2s\", vcc, \"\");\n" " \telse\n" @@ -227,7 +227,7 @@ "--- a/net/key/af_key.c\n" "+++ b/net/key/af_key.c\n" "@@ -3643,7 +3643,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)\n" - " \tif (v = SEQ_START_TOKEN)\n" + " \tif (v == SEQ_START_TOKEN)\n" " \t\tseq_printf(f ,\"sk RefCnt Rmem Wmem User Inode\\n\");\n" " \telse\n" "-\t\tseq_printf(f ,\"%p %-6d %-6u %-6u %-6u %-6lu\\n\",\n" @@ -310,4 +310,4 @@ " \t\t\tatomic_read(&s->sk_refcnt),\n" " \t\t\t0," -8005a1c7d8561efda97c22e98ee4d43308496a0d3759ed1a951827d80794f3b5 +8f13fb7c92e9d53f6ea6a0be9ed5a265d81a8edba5dc43dc74855bce1052d174
diff --git a/a/1.txt b/N2/1.txt index 8f58d39..1cff154 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -53,7 +53,7 @@ index f85da07..be3afde 100644 @@ -218,7 +218,7 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc) { if (!vcc->dev) - seq_printf(seq, sizeof(void *) = 4 ? + seq_printf(seq, sizeof(void *) == 4 ? - "N/A@%p%10s" : "N/A@%p%2s", vcc, ""); + "N/A@%pK%10s" : "N/A@%pK%2s", vcc, ""); else @@ -195,7 +195,7 @@ index d87c22d..cf00ddf 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3643,7 +3643,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v) - if (v = SEQ_START_TOKEN) + if (v == SEQ_START_TOKEN) seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else - seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n", diff --git a/a/content_digest b/N2/content_digest index 6dadf7b..49ca1d4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "From\0Dan Rosenberg <drosenberg@vsecurity.com>\0" "Subject\0[PATCH] Convert net %p usage %pK\0" - "Date\0Thu, 23 Dec 2010 03:22:27 +0000\0" + "Date\0Wed, 22 Dec 2010 22:22:27 -0500\0" "To\0linux-kernel@vger.kernel.org" netdev@vger.kernel.org " linux-sctp@vger.kernel.org\0" @@ -26,8 +26,7 @@ Urs Thuermann <urs.thuermann@volkswagen.de> Greg Kroah-Hartman <gregkh@suse.de> Daniel Lezcano <daniel.lezcano@free.fr> - Pavel Emelyanov <xemul@openvz.org> - " Andrew Morton <akpm@linux-foundation.org>\0" + " Pavel Emelyan\0" "\00:1\0" "b\0" "The %pK format specifier is designed to hide exposed kernel pointers,\n" @@ -85,7 +84,7 @@ "@@ -218,7 +218,7 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)\n" " {\n" " \tif (!vcc->dev)\n" - " \t\tseq_printf(seq, sizeof(void *) = 4 ?\n" + " \t\tseq_printf(seq, sizeof(void *) == 4 ?\n" "-\t\t\t \"N/A@%p%10s\" : \"N/A@%p%2s\", vcc, \"\");\n" "+\t\t\t \"N/A@%pK%10s\" : \"N/A@%pK%2s\", vcc, \"\");\n" " \telse\n" @@ -227,7 +226,7 @@ "--- a/net/key/af_key.c\n" "+++ b/net/key/af_key.c\n" "@@ -3643,7 +3643,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)\n" - " \tif (v = SEQ_START_TOKEN)\n" + " \tif (v == SEQ_START_TOKEN)\n" " \t\tseq_printf(f ,\"sk RefCnt Rmem Wmem User Inode\\n\");\n" " \telse\n" "-\t\tseq_printf(f ,\"%p %-6d %-6u %-6u %-6u %-6lu\\n\",\n" @@ -310,4 +309,4 @@ " \t\t\tatomic_read(&s->sk_refcnt),\n" " \t\t\t0," -8005a1c7d8561efda97c22e98ee4d43308496a0d3759ed1a951827d80794f3b5 +86d14561ad6426768ede0367093ef02243cb2ef95cc25750f434fe4b49b1212d
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.