135e2/xv6-labs.git, branch thread xv6-labs-2024-winter lab lock: update bcache lock name 2024-02-17T02:50:50+00:00 Mole Shang 135e2@135e2.dev 2024-02-17T02:48:18+00:00 d85aec2689c4250d0384904bdc11aa618c726bec 






lab thread: finish
2024-02-16T03:31:23+00:00

Mole Shang
135e2@135e2.dev

2024-02-16T03:29:36+00:00

edd523ffcb39c1c57944796fabfc71c70a10ce2e












Merge branch 'lock' into thread
2024-02-16T02:20:27+00:00

Mole Shang
135e2@135e2.dev

2024-02-16T02:20:27+00:00

a98c56a811142e5ede3332a7a444cca45f628769

Conflicts:
	.gitignore
	Makefile
	conf/lab.mk





Conflicts:
	.gitignore
	Makefile
	conf/lab.mk







lab lock/bcache: finish
2024-02-16T02:05:03+00:00

Mole Shang
135e2@135e2.dev

2024-02-16T02:05:03+00:00

99015f3a985b2fd051606636743a2a2969b216e8












lab lock/kalloc: finish
2024-02-15T14:53:22+00:00

Mole Shang
135e2@135e2.dev

2024-02-14T15:10:54+00:00

16f51058790ba5779cf46de18e6a266f2fac0a1d












Merge branch 'net' into lock
2024-02-14T12:46:23+00:00

Mole Shang
135e2@135e2.dev

2024-02-14T12:46:23+00:00

f98eeb30507040dc916b2a337818830954ee1d4a

 Conflicts:
	.gitignore
	Makefile
	conf/lab.mk
	kernel/defs.h
	user/user.h





 Conflicts:
	.gitignore
	Makefile
	conf/lab.mk
	kernel/defs.h
	user/user.h







lab net: finish
2024-02-13T13:50:47+00:00

Mole Shang
135e2@135e2.dev

2024-02-13T13:32:02+00:00

904885a96efd1dd0221585f67477f5a39bcce7f7












Merge branch 'cow' into net
2024-02-13T11:39:56+00:00

Mole Shang
135e2@135e2.dev

2024-02-13T11:39:56+00:00

89ef6f717ed4b3e702e5f6f906f58fe1ea27d366

Conflicts:
	.gitignore
	Makefile
	conf/lab.mk
	kernel/defs.h
	kernel/syscall.c
	kernel/vm.c
	user/pingpong.c
	user/user.h
	user/usys.pl





Conflicts:
	.gitignore
	Makefile
	conf/lab.mk
	kernel/defs.h
	kernel/syscall.c
	kernel/vm.c
	user/pingpong.c
	user/user.h
	user/usys.pl







lab cow: finish
2024-02-11T09:51:28+00:00

Mole Shang
135e2@135e2.dev

2024-02-11T09:51:28+00:00

4a6593f1a6f666c618d303a4858c4c6d31b41c63












Merge branch 'traps' into cow
2024-02-11T08:06:15+00:00

Mole Shang
135e2@135e2.dev

2024-02-11T06:44:22+00:00

2fe04bc8faa4bf737a86c36a8017473e84814f3b

Conflicts:
	.gitignore
	Makefile
	conf/lab.mk





Conflicts:
	.gitignore
	Makefile
	conf/lab.mk