All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20191128083735.GE1781@kadam>

diff --git a/a/1.txt b/N1/1.txt
index bfc449d..e9bdd86 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,7 +21,7 @@ On Thu, Nov 28, 2019 at 08:18:30AM +0000, Anton Ivanov wrote:
 > > >   	} else {
 > > > -		vp->bpf = kmalloc(sizeof(struct sock_fprog), GFP_KERNEL);
 > > > +		vp->bpf = kmalloc(sizeof(struct sock_fprog), GFP_ATOMIC);
-> > >   		if (vp->bpf == NULL) {
+> > >   		if (vp->bpf = NULL) {
 > > >   			netdev_err(dev, "failed to allocate memory for firmware\n");
 > > >   			goto flash_fail;
 > > > @@ -1414,7 +1414,7 @@ static int vector_net_load_bpf_flash(struct net_device *dev,
diff --git a/a/content_digest b/N1/content_digest
index 9575336..f7dc1ee 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,7 +3,7 @@
  "ref\05892ee7c-ff24-fb3c-6911-44e0b1d5895f@cambridgegreys.com\0"
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0Re: [PATCH -next] um: vector: use GFP_ATOMIC under spin lock\0"
- "Date\0Thu, 28 Nov 2019 11:37:35 +0300\0"
+ "Date\0Thu, 28 Nov 2019 08:37:35 +0000\0"
  "To\0Anton Ivanov <anton.ivanov@cambridgegreys.com>\0"
  "Cc\0Wei Yongjun <weiyongjun1@huawei.com>"
   Song Liu <songliubraving@fb.com>
@@ -41,7 +41,7 @@
  "> > >   \t} else {\n"
  "> > > -\t\tvp->bpf = kmalloc(sizeof(struct sock_fprog), GFP_KERNEL);\n"
  "> > > +\t\tvp->bpf = kmalloc(sizeof(struct sock_fprog), GFP_ATOMIC);\n"
- "> > >   \t\tif (vp->bpf == NULL) {\n"
+ "> > >   \t\tif (vp->bpf = NULL) {\n"
  "> > >   \t\t\tnetdev_err(dev, \"failed to allocate memory for firmware\\n\");\n"
  "> > >   \t\t\tgoto flash_fail;\n"
  "> > > @@ -1414,7 +1414,7 @@ static int vector_net_load_bpf_flash(struct net_device *dev,\n"
@@ -60,4 +60,4 @@
  "regards,\n"
  dan carpenter
 
-ac8afa2b609d064de7e9eac59ff2b050b5566e6ecc784fddbdd7a7963b036bf3
+c23b215304f97db221dea7a58521160bab351c1c935b51df0f7f76e144ba38b0

diff --git a/a/1.txt b/N2/1.txt
index bfc449d..406cc9f 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -39,3 +39,9 @@ should have triggered a warning if so.
 
 regards,
 dan carpenter
+
+
+_______________________________________________
+linux-um mailing list
+linux-um@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-um
diff --git a/a/content_digest b/N2/content_digest
index 9575336..22e247d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,14 +5,14 @@
  "Subject\0Re: [PATCH -next] um: vector: use GFP_ATOMIC under spin lock\0"
  "Date\0Thu, 28 Nov 2019 11:37:35 +0300\0"
  "To\0Anton Ivanov <anton.ivanov@cambridgegreys.com>\0"
- "Cc\0Wei Yongjun <weiyongjun1@huawei.com>"
-  Song Liu <songliubraving@fb.com>
+ "Cc\0Song Liu <songliubraving@fb.com>"
   Daniel Borkmann <daniel@iogearbox.net>
-  kernel-janitors@vger.kernel.org
   Richard Weinberger <richard@nod.at>
   Jeff Dike <jdike@addtoit.com>
-  linux-um@lists.infradead.org
+  kernel-janitors@vger.kernel.org
   Alexei Starovoitov <ast@kernel.org>
+  linux-um@lists.infradead.org
+  Wei Yongjun <weiyongjun1@huawei.com>
   netdev@vger.kernel.org
   bpf@vger.kernel.org
  " Martin KaFai Lau <kafai@fb.com>\0"
@@ -58,6 +58,12 @@
  "should have triggered a warning if so.\n"
  "\n"
  "regards,\n"
- dan carpenter
+ "dan carpenter\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-um mailing list\n"
+ "linux-um@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-um
 
-ac8afa2b609d064de7e9eac59ff2b050b5566e6ecc784fddbdd7a7963b036bf3
+7d96a1daf0893b4640a6a8e3398b235987144ce55dddd9ba6b0088c321ff5352

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.