diff options
| author | Mole Shang <135e2@135e2.dev> | 2024-02-19 14:10:32 +0800 |
|---|---|---|
| committer | Mole Shang <135e2@135e2.dev> | 2024-02-19 14:36:21 +0800 |
| commit | d86118fc80267649b4791c8c0c72ebd60edf1ef2 (patch) | |
| tree | b792b617b4df80a5803a9c1164d0e3fdfe9cfe31 /.gitignore | |
| parent | b20ef9d0210fd7d9403acde1857eed1b9880c0b2 (diff) | |
| parent | 0cf897cbe05fd8485162619db4244f4159d0eb52 (diff) | |
| download | xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.gz xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.bz2 xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.zip | |
Merge branch 'fs' into mmap
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
user/user.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -11,7 +11,7 @@ entryother initcode initcode.out kernelmemfs -mkfs +mkfs/mkfs kernel/kernel user/usys.S .gdbinit @@ -25,3 +25,5 @@ barrier .DS_Store *.dSYM *.pcap +riscv/ +compile_flags.txt |