diff options
| author | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-13 19:39:56 +0800 |
| commit | 89ef6f717ed4b3e702e5f6f906f58fe1ea27d366 (patch) | |
| tree | 760cce316675479a6cca77551438e8d2cc5fe9ae /.gitignore | |
| parent | cfae93475dfb4cb5cfe264f4c029136e1447c262 (diff) | |
| parent | 4a6593f1a6f666c618d303a4858c4c6d31b41c63 (diff) | |
| download | xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.gz xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.tar.bz2 xv6-labs-89ef6f717ed4b3e702e5f6f906f58fe1ea27d366.zip | |
Merge branch 'cow' into net
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
kernel/syscall.c
kernel/vm.c
user/pingpong.c
user/user.h
user/usys.pl
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -25,3 +25,5 @@ barrier .DS_Store *.dSYM *.pcap +riscv/ +compile_flags.txt |