diff for duplicates of <20130220.170901.343210063003534302.davem@davemloft.net>
diff --git a/a/1.txt b/N1/1.txt
index fe7da8e..c82a8cf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -283,7 +283,7 @@ Arik Nemtsov (23):
Arnd Bergmann (1):
mac80211: avoid a build warning
-Aurélien Guillaume (1):
+Aurélien Guillaume (1):
ixgbe: implement SFF diagnostic monitoring via ethtool
Aviad Yehezkel (1):
@@ -333,7 +333,7 @@ Bing Zhao (4):
Bjorn Helgaas (1):
e1000e: Use standard #defines for PCIe Capability ASPM fields
-Bjørn Mork (1):
+Bjørn Mork (1):
net: cdc_ncm: fix probing of devices with multiple control interface altsettings
Bob Copeland (2):
@@ -1392,7 +1392,7 @@ Lilach Edelstein (2):
iwlwifi: add iwl_set_bits_mask to transport API
iwlwifi: move register access lock into transport
-Linus Lüssing (1):
+Linus Lüssing (1):
batman-adv: Do not add multicast MAC addresses to translation table
Lucas Stach (2):
@@ -1501,10 +1501,10 @@ Michal Kubecek (2):
xfrm: remove unused xfrm4_policy_fini()
xfrm: make gc_thresh configurable in all namespaces
-Michal KubeÄek (1):
+Michal Kubeček (1):
netfilter: nf_ct_reasm: fix per-netns sysctl initialization
-Michał Mirosław (1):
+Michał Mirosław (1):
net: disallow drivers with buggy VLAN accel to register_netdevice()
Ming Lei (1):
@@ -1613,7 +1613,7 @@ Paul Gortmaker (26):
gianfar: remove largely unused gfar_stats struct
gianfar: convert u64 status counters to atomic64_t
-Peter Hüwe (1):
+Peter Hüwe (1):
ethernet/broadcom/tg3: Fix sparse warning: constant 0x7fffffffffffffff is so big it is long long
Piotr Haber (5):
@@ -1629,7 +1629,7 @@ Pravin B Shelar (4):
net: factor out skb_mac_gso_segment() from skb_gso_segment()
v4 GRE: Add TCP segmentation offload for GRE
-Rafał Miłecki (11):
+Rafał Miłecki (11):
ssb: add place for serial flash driver
bgmac: driver for GBit MAC core on BCMA bus
ssb: add database of serial flash memories
@@ -1859,7 +1859,7 @@ Tim Gardner (2):
brcmsmac: fix u16 overflow warning
brcmsmac: avoid 512 byte stack variable
-Timo Teräs (1):
+Timo Teräs (1):
r8169: remove unneeded dirty_rx index
Tom Herbert (7):
@@ -1994,7 +1994,7 @@ YOSHIFUJI Hideaki (2):
ipv6: Fix endianess warning in ip6_flow_hdr().
ipv6: Make ipv6_addr_is_XXX() return boolean.
-YOSHIFUJI Hideaki / å‰è—¤è‹±æ˜Ž (82):
+YOSHIFUJI Hideaki / 吉藤英明 (82):
ndisc: Remove unused space at tail of skb for ndisc messages. (TAKE 3)
ndisc: Use struct rd_msg for redirect message.
ipv4: Use FIELD_SIZEOF() in inet_init().
@@ -3739,5 +3739,4 @@ stephen hemminger (7):
delete mode 100644 net/wanrouter/Makefile
delete mode 100644 net/wanrouter/patchlevel
delete mode 100644 net/wanrouter/wanmain.c
- delete mode 100644 net/wanrouter/wanproc.c
-ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
\ No newline at end of file
+ delete mode 100644 net/wanrouter/wanproc.c
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 4037a5c..9cc1c64 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -307,7 +307,7 @@
"Arnd Bergmann (1):\n",
" mac80211: avoid a build warning\n",
"\n",
- "Aur\303\203\302\251lien Guillaume (1):\n",
+ "Aur\303\251lien Guillaume (1):\n",
" ixgbe: implement SFF diagnostic monitoring via ethtool\n",
"\n",
"Aviad Yehezkel (1):\n",
@@ -357,7 +357,7 @@
"Bjorn Helgaas (1):\n",
" e1000e: Use standard #defines for PCIe Capability ASPM fields\n",
"\n",
- "Bj\303\203\302\270rn Mork (1):\n",
+ "Bj\303\270rn Mork (1):\n",
" net: cdc_ncm: fix probing of devices with multiple control interface altsettings\n",
"\n",
"Bob Copeland (2):\n",
@@ -1416,7 +1416,7 @@
" iwlwifi: add iwl_set_bits_mask to transport API\n",
" iwlwifi: move register access lock into transport\n",
"\n",
- "Linus L\303\203\302\274ssing (1):\n",
+ "Linus L\303\274ssing (1):\n",
" batman-adv: Do not add multicast MAC addresses to translation table\n",
"\n",
"Lucas Stach (2):\n",
@@ -1525,10 +1525,10 @@
" xfrm: remove unused xfrm4_policy_fini()\n",
" xfrm: make gc_thresh configurable in all namespaces\n",
"\n",
- "Michal Kube\303\204\302\215ek (1):\n",
+ "Michal Kube\304\215ek (1):\n",
" netfilter: nf_ct_reasm: fix per-netns sysctl initialization\n",
"\n",
- "Micha\303\205\302\202 Miros\303\205\302\202aw (1):\n",
+ "Micha\305\202 Miros\305\202aw (1):\n",
" net: disallow drivers with buggy VLAN accel to register_netdevice()\n",
"\n",
"Ming Lei (1):\n",
@@ -1637,7 +1637,7 @@
" gianfar: remove largely unused gfar_stats struct\n",
" gianfar: convert u64 status counters to atomic64_t\n",
"\n",
- "Peter H\303\203\302\274we (1):\n",
+ "Peter H\303\274we (1):\n",
" ethernet/broadcom/tg3: Fix sparse warning: constant 0x7fffffffffffffff is so big it is long long\n",
"\n",
"Piotr Haber (5):\n",
@@ -1653,7 +1653,7 @@
" net: factor out skb_mac_gso_segment() from skb_gso_segment()\n",
" v4 GRE: Add TCP segmentation offload for GRE\n",
"\n",
- "Rafa\303\205\302\202 Mi\303\205\302\202ecki (11):\n",
+ "Rafa\305\202 Mi\305\202ecki (11):\n",
" ssb: add place for serial flash driver\n",
" bgmac: driver for GBit MAC core on BCMA bus\n",
" ssb: add database of serial flash memories\n",
@@ -1883,7 +1883,7 @@
" brcmsmac: fix u16 overflow warning\n",
" brcmsmac: avoid 512 byte stack variable\n",
"\n",
- "Timo Ter\303\203\302\244s (1):\n",
+ "Timo Ter\303\244s (1):\n",
" r8169: remove unneeded dirty_rx index\n",
"\n",
"Tom Herbert (7):\n",
@@ -2018,7 +2018,7 @@
" ipv6: Fix endianess warning in ip6_flow_hdr().\n",
" ipv6: Make ipv6_addr_is_XXX() return boolean.\n",
"\n",
- "YOSHIFUJI Hideaki / \303\245\302\220\302\211\303\250\302\227\302\244\303\250\302\213\302\261\303\246\302\230\302\216 (82):\n",
+ "YOSHIFUJI Hideaki / \345\220\211\350\227\244\350\213\261\346\230\216 (82):\n",
" ndisc: Remove unused space at tail of skb for ndisc messages. (TAKE 3)\n",
" ndisc: Use struct rd_msg for redirect message.\n",
" ipv4: Use FIELD_SIZEOF() in inet_init().\n",
@@ -3763,8 +3763,7 @@
" delete mode 100644 net/wanrouter/Makefile\n",
" delete mode 100644 net/wanrouter/patchlevel\n",
" delete mode 100644 net/wanrouter/wanmain.c\n",
- " delete mode 100644 net/wanrouter/wanproc.c\n",
- "\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\27\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\35\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\3(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\32\302\266\em\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\24\4\32\302\266\em\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245"
+ " delete mode 100644 net/wanrouter/wanproc.c"
]
-3d703972d9ddfedeb513fd80ced6ca9b5a0c69ff1fd42f40db603b2ad45ee9ea
+821cc019df63ea97fd7c14d2f279dd9dcf786f9f4004ac5989c3896093998086
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.