- Update to 2.6.24-rc7-git3.
authorJeff Mahoney <jeffm@suse.de>
Fri, 11 Jan 2008 19:35:08 +0000 (19:35 +0000)
committerJeff Mahoney <jeffm@suse.de>
Fri, 11 Jan 2008 19:35:08 +0000 (19:35 +0000)
suse-commit: 19a8e65e115a2f3f5d20c461f02a10a6d8b2dddd

13 files changed:
1  2 
Documentation/kernel-parameters.txt
Makefile
drivers/ata/libata-eh.c
drivers/net/qla3xxx.c
drivers/net/xen-netfront.c
fs/binfmt_elf.c
fs/ecryptfs/inode.c
kernel/kexec.c
kernel/sched.c
mm/filemap_xip.c
mm/page_alloc.c
net/core/dev.c
net/core/skbuff.c

Simple merge
diff --cc Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 24
--EXTRAVERSION = -rc7
++EXTRAVERSION = -rc7-git3
  NAME = Arr Matey! A Hairy Bilge Rat!
  
  # *DOCUMENTATION*
Simple merge
Simple merge
diff --cc fs/binfmt_elf.c
Simple merge
Simple merge
diff --cc kernel/kexec.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc net/core/dev.c
Simple merge
@@@ -416,20 -416,17 +416,21 @@@ static struct sk_buff *__skb_clone(stru
        C(len);
        C(data_len);
        C(mac_len);
-       n->cloned = 1;
        n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;
+       n->cloned = 1;
        n->nohdr = 0;
 +#ifdef CONFIG_XEN
 +      C(proto_data_valid);
 +      C(proto_csum_blank);
 +#endif
        n->destructor = NULL;
-       C(truesize);
-       atomic_set(&n->users, 1);
-       C(head);
-       C(data);
+       C(iif);
        C(tail);
        C(end);
+       C(head);
+       C(data);
+       C(truesize);
+       atomic_set(&n->users, 1);
  
        atomic_inc(&(skb_shinfo(skb)->dataref));
        skb->cloned = 1;