diff options
| author | Mole Shang <135e2@135e2.dev> | 2024-02-16 10:20:27 +0800 |
|---|---|---|
| committer | Mole Shang <135e2@135e2.dev> | 2024-02-16 10:20:27 +0800 |
| commit | a98c56a811142e5ede3332a7a444cca45f628769 (patch) | |
| tree | c93ff7090da7b6ef911932be283818c2f6a03784 /.gitignore | |
| parent | 0d65be5d1d880afafbf08c2adb605cf9f72216e2 (diff) | |
| parent | 99015f3a985b2fd051606636743a2a2969b216e8 (diff) | |
| download | xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.gz xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.bz2 xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.zip | |
Merge branch 'lock' into thread
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -11,7 +11,7 @@ entryother initcode initcode.out kernelmemfs -mkfs +mkfs/mkfs kernel/kernel user/usys.S .gdbinit @@ -24,3 +24,6 @@ barrier /lab-*.json .DS_Store *.dSYM +*.pcap +riscv/ +compile_flags.txt |