summaryrefslogtreecommitdiff
path: root/curvetun/Makefile
blob: 6d996b0a22fdb1a14c000e6718929eb28071396f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
curvetun-libs =	-lnacl \
		-lpthread

curvetun-objs =	xmalloc.o \
		epoll2.o \
		str.o \
		dev.o \
		stun.o \
		sock.o \
		sig.o \
		link.o \
		patricia.o \
		corking.o \
		trie.o \
		taia.o \
		hash.o \
		rnd.o \
		curve.o \
		curve_test.o \
		cookie.o \
		keypair.o \
		ioexact.o \
		ioops.o \
		cpusched.o \
		curvetun_mgmt_servers.o \
		curvetun_mgmt_users.o \
		curvetun_server.o \
		curvetun_client.o \
		curvetun.o

curvetun-eflags = -I ${CONFIG_NACL_INC_DIR}

curvetun-confs =
:30 -0500 commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /fs/afs/vlclient.c parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/vlclient.c')