---

yaml
---
r: 6329
b: refs/heads/master
c: 8c60f3f
h: refs/heads/master
i:
  6327: a7f9449
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 540722ffc3a0d7e11d97a13e1ce6f3bc23b061c1
+refs/heads/master: 8c60f3fab55712f23f2bd557ceedfbb00c649f37

trunk/include/linux/list.h

@@ -427,7 +427,8 @@ static inline void list_splice_init(struct list_head *list,
  * @member:	the name of the list_struct within the struct.
  */
 #define list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = n, n = list_entry(n->member.next, typeof(*n), member);	\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
 	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 

trunk/net/dccp/Makefile

@@ -1,5 +1,6 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
-dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o timer.o
+dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
+	  timer.o packet_history.o
 
 obj-y += ccids/