So we have a copy of linux's list.h, which I brought over back in
2015.  Of course, linux has updated theirs since then, and I'd like
the changes.  What do we do?

Ah!  I kept track of the commit:

/* Linux's list definitions.
 *
 * From commit bc208e0ee0f46744aac95c29366144271a6962bb */

So let's head over to the linux repo:

$ git diff bc208e0ee0f4..HEAD include/linux/list.h > ~/foo.patch

Take a look at the patch (notice the different directories, need to
strip by 3, etc)

diff --git a/include/linux/list.h b/include/linux/list.h
index feb773c76ee0..ae537fa46216 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h

And just apply it to the akaros repo (where list.h is)

$ cd kern/include/
$ patch -p3 < ~/foo.patch
patching file list.h
Hunk #1 succeeded at 52 (offset 28 lines).
Hunk #2 succeeded at 130 (offset 28 lines).
Hunk #3 succeeded at 139 (offset 28 lines).
Hunk #4 succeeded at 227 (offset 28 lines).
Hunk #5 succeeded at 422 (offset 28 lines).
Hunk #6 succeeded at 554 (offset 28 lines).
Hunk #7 succeeded at 665 (offset 28 lines).
Hunk #8 succeeded at 699 (offset 28 lines).
Hunk #9 succeeded at 710 (offset 28 lines).
Hunk #10 succeeded at 730 (offset 28 lines).

And update the top of list.h to track the latest commit.  Done.  The
mlx4 driver will probably be more difficult, but not intractable.

Barret



-- 
You received this message because you are subscribed to the Google Groups 
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to akaros+unsubscr...@googlegroups.com.
To post to this group, send email to akaros@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to