[linux] 01/01: Update to 2.6.32.70

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Fri Jan 29 23:42:38 UTC 2016 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch squeeze-security
in repository linux.

commit 105286c48181c7056f6e3e6fb26ceafe16a979ff
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 30 00:42:24 2016 +0100

    Update to 2.6.32.70
---
 debian/changelog                                   |   2 +-
 ...ion_align_up-and-section_align_down-macro.patch |  34 ------
 .../{2.6.32.70-rc1.patch => 2.6.32.70.patch}       | 131 ++++++++++++---------
 debian/patches/series/48squeeze19                  |   4 +-
 4 files changed, 76 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09290d0..a90edff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ linux-2.6 (2.6.32-48squeeze19) UNRELEASED; urgency=medium
     (CVE-2015-8767)
   * tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) (CVE-2016-0723)
   * unix: properly account for FDs passed over unix sockets (CVE-2013-4312)
-  * Add stable release 2.6.32.70-rc1:
+  * Add stable release 2.6.32.70:
     - ip6mr: call del_timer_sync() in ip6mr_free_table()
     - sctp: translate host order to network order when setting a hmacid
     - fuse: break infinite loop in fuse_fill_write_pages() (CVE-2015-8785)
diff --git a/debian/patches/bugfix/all/mm-add-section_align_up-and-section_align_down-macro.patch b/debian/patches/bugfix/all/mm-add-section_align_up-and-section_align_down-macro.patch
deleted file mode 100644
index f9ecb6d..0000000
--- a/debian/patches/bugfix/all/mm-add-section_align_up-and-section_align_down-macro.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Daniel Kiper <dkiper at net-space.pl>
-Date: Tue, 24 May 2011 17:12:51 -0700
-Subject: mm: add SECTION_ALIGN_UP() and SECTION_ALIGN_DOWN() macro
-Origin: https://git.kernel.org/linus/a539f3533b78e39a22723d6d3e1e11b6c14454d9
-
-Add SECTION_ALIGN_UP() and SECTION_ALIGN_DOWN() macro which aligns given
-pfn to upper section and lower section boundary accordingly.
-
-Required for the latest memory hotplug support for the Xen balloon driver.
-
-Signed-off-by: Daniel Kiper <dkiper at net-space.pl>
-Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
-David Rientjes <rientjes at google.com>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-[bwh: Build fix for 2.6.32.70-rc1. Backported to 2.6.32: adjust context]
----
- include/linux/mmzone.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index d715200..217bcf6 100644
---- a/include/linux/mmzone.h
-+++ b/include/linux/mmzone.h
-@@ -937,6 +937,9 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn)
- #define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT)
- #define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT)
- 
-+#define SECTION_ALIGN_UP(pfn)	(((pfn) + PAGES_PER_SECTION - 1) & PAGE_SECTION_MASK)
-+#define SECTION_ALIGN_DOWN(pfn)	((pfn) & PAGE_SECTION_MASK)
-+
- #ifdef CONFIG_SPARSEMEM
- 
- /*
diff --git a/debian/patches/bugfix/all/stable/2.6.32.70-rc1.patch b/debian/patches/bugfix/all/stable/2.6.32.70.patch
similarity index 94%
rename from debian/patches/bugfix/all/stable/2.6.32.70-rc1.patch
rename to debian/patches/bugfix/all/stable/2.6.32.70.patch
index ce5ced6..86f91f1 100644
--- a/debian/patches/bugfix/all/stable/2.6.32.70-rc1.patch
+++ b/debian/patches/bugfix/all/stable/2.6.32.70.patch
@@ -1,5 +1,5 @@
 diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
-index b72c554..44194c1 100644
+index b72c55484840..44194c162637 100644
 --- a/arch/mips/kernel/scall32-o32.S
 +++ b/arch/mips/kernel/scall32-o32.S
 @@ -194,6 +194,7 @@ illegal_syscall:
@@ -11,7 +11,7 @@ index b72c554..44194c1 100644
  	/* Some syscalls like execve get their arguments from struct pt_regs
  	   and claim zero arguments in the syscall table. Thus we have to
 diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
-index 33ed571..1f7c01f 100644
+index 33ed571ae78a..1f7c01f6a125 100644
 --- a/arch/mips/kernel/scall64-o32.S
 +++ b/arch/mips/kernel/scall64-o32.S
 @@ -180,6 +180,7 @@ LEAF(sys32_syscall)
@@ -23,7 +23,7 @@ index 33ed571..1f7c01f 100644
  	move	a0, a1			# shift argument registers
  	move	a1, a2
 diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
-index e8467e4..9b39674 100644
+index e8467e4aa8d1..9b396746bf7f 100644
 --- a/arch/parisc/kernel/signal.c
 +++ b/arch/parisc/kernel/signal.c
 @@ -474,6 +474,55 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
@@ -116,7 +116,7 @@ index e8467e4..9b39674 100644
  		break;
  	}
 diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
-index db943a7..d9dfffc 100644
+index db943a7ec513..d9dfffc38b90 100644
 --- a/arch/s390/kernel/dis.c
 +++ b/arch/s390/kernel/dis.c
 @@ -1182,14 +1182,21 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
@@ -146,7 +146,7 @@ index db943a7..d9dfffc 100644
  				ptr += sprintf(ptr, "%lx", (signed int) value
  								      + addr);
 diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
-index 7e361b4..2fc5c55 100644
+index 7e361b4d2a8c..2fc5c5515fb1 100644
 --- a/arch/x86/kvm/i8254.c
 +++ b/arch/x86/kvm/i8254.c
 @@ -356,6 +356,7 @@ void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val, int hpet_legacy_s
@@ -158,7 +158,7 @@ index 7e361b4..2fc5c55 100644
  		kvm->arch.vpit->pit_state.channels[0].mode = 0xff; /* disable timer */
  		pit_load_count(kvm, channel, val);
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index cdee77e..042d073 100644
+index cdee77eed199..042d07390c02 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
 @@ -2131,10 +2131,11 @@ static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps)
@@ -195,7 +195,7 @@ index cdee77e..042d073 100644
  	return r;
  }
 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index abae8c9..f502f6d 100644
+index abae8c992594..f502f6d8b8d2 100644
 --- a/drivers/char/ipmi/ipmi_si_intf.c
 +++ b/drivers/char/ipmi/ipmi_si_intf.c
 @@ -1066,15 +1066,15 @@ static int smi_start_processing(void       *send_info,
@@ -219,7 +219,7 @@ index abae8c9..f502f6d 100644
  	 * Check if the user forcefully enabled the daemon.
  	 */
 diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c
-index 9605ee5..fbc5824 100644
+index 9605ee5b931e..fbc58244af4b 100644
 --- a/drivers/char/tty_buffer.c
 +++ b/drivers/char/tty_buffer.c
 @@ -450,10 +450,12 @@ static void flush_to_ldisc(struct work_struct *work)
@@ -239,7 +239,7 @@ index 9605ee5..fbc5824 100644
  		clear_bit(TTY_FLUSHING, &tty->flags);
  	}
 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
-index 3071a52..10b954f 100644
+index 3071a52467ed..10b954ff4b7e 100644
 --- a/drivers/isdn/gigaset/ser-gigaset.c
 +++ b/drivers/isdn/gigaset/ser-gigaset.c
 @@ -381,20 +381,24 @@ static void gigaset_freecshw(struct cardstate *cs)
@@ -271,7 +271,7 @@ index 3071a52..10b954f 100644
  
  /*
 diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
-index 613ba04..12dfb90 100644
+index 613ba0435372..12dfb908049a 100644
 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c
 +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
 @@ -1154,7 +1154,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop)
@@ -310,7 +310,7 @@ index 613ba04..12dfb90 100644
  	}
  	if (cnt > maxloop) /* only for ISAC/HSCX without PCI IRQ test */
 diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
-index 642d5aa..390600e 100644
+index 642d5aaf53ce..390600e71527 100644
 --- a/drivers/isdn/i4l/isdn_ppp.c
 +++ b/drivers/isdn/i4l/isdn_ppp.c
 @@ -300,6 +300,8 @@ isdn_ppp_open(int min, struct file *file)
@@ -347,7 +347,7 @@ index 642d5aa..390600e 100644
  					slhc_free(is->slcomp);
  				is->slcomp = sltmp;
 diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
-index 5e9156a..7f525e0 100644
+index 5e9156a8415e..7f525e002b6c 100644
 --- a/drivers/net/ppp_generic.c
 +++ b/drivers/net/ppp_generic.c
 @@ -705,9 +705,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
@@ -363,7 +363,7 @@ index 5e9156a..7f525e0 100644
  		}
  		ppp_lock(ppp);
 diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c
-index d640c0f..4c6cb0f 100644
+index d640c0f5470b..4c6cb0f5811b 100644
 --- a/drivers/net/slhc.c
 +++ b/drivers/net/slhc.c
 @@ -84,8 +84,9 @@ static long decode(unsigned char **cpp);
@@ -412,7 +412,7 @@ index d640c0f..4c6cb0f 100644
  
  
 diff --git a/drivers/net/slip.c b/drivers/net/slip.c
-index 9a3088f..2b31013 100644
+index 9a3088faa47b..2b3101369a71 100644
 --- a/drivers/net/slip.c
 +++ b/drivers/net/slip.c
 @@ -162,7 +162,7 @@ static int sl_alloc_bufs(struct slip *sl, int mtu)
@@ -425,7 +425,7 @@ index 9a3088f..2b31013 100644
  #endif
  	spin_lock_bh(&sl->lock);
 diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
-index 2794504..a237180 100644
+index 27945049c9e1..a237180464c4 100644
 --- a/drivers/net/wan/x25_asy.c
 +++ b/drivers/net/wan/x25_asy.c
 @@ -553,16 +553,12 @@ static void x25_asy_receive_buf(struct tty_struct *tty,
@@ -447,7 +447,7 @@ index 2794504..a237180 100644
  	sl = x25_asy_alloc();
  	if (sl == NULL)
 diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
-index 340124d..18a15f4 100644
+index 340124dd3f67..18a15f4f2eb9 100644
 --- a/drivers/scsi/ses.c
 +++ b/drivers/scsi/ses.c
 @@ -67,6 +67,7 @@ static int ses_probe(struct device *dev)
@@ -504,7 +504,7 @@ index 340124d..18a15f4 100644
  
  		}
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index b76f246..85438ae 100644
+index b76f2468a84a..85438ae90a50 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
 @@ -472,7 +472,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
@@ -517,7 +517,7 @@ index b76f246..85438ae 100644
  
  	return master;
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 02aad50..5ebd1f1 100644
+index 02aad5091243..5ebd1f15ba35 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
@@ -574,7 +574,7 @@ index 02aad50..5ebd1f1 100644
  
  /* Implement the continuations for the delays above */
 diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
-index d6231c3..09102e3 100644
+index d6231c38813e..09102e3ab485 100644
 --- a/drivers/usb/serial/ipaq.c
 +++ b/drivers/usb/serial/ipaq.c
 @@ -663,8 +663,8 @@ static int ipaq_open(struct tty_struct *tty,
@@ -589,7 +589,7 @@ index d6231c3..09102e3 100644
  				usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21,
  				0x1, 0, NULL, 0, 100);
 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 67c46ed..e29e092 100644
+index 67c46ed09e44..e29e0924ca2d 100644
 --- a/fs/ext4/ext4.h
 +++ b/fs/ext4/ext4.h
 @@ -26,6 +26,7 @@
@@ -664,7 +664,7 @@ index 67c46ed..e29e092 100644
  
  #define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode)			       \
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 045e7bf..8ec8e1f 100644
+index 045e7bf9c753..8ec8e1f28764 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
 @@ -2767,14 +2767,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
@@ -703,7 +703,7 @@ index 045e7bf..8ec8e1f 100644
  	default:
  		break;
 diff --git a/fs/fuse/file.c b/fs/fuse/file.c
-index 102d582..c8dc4f3 100644
+index 102d58297174..c8dc4f3ba42a 100644
 --- a/fs/fuse/file.c
 +++ b/fs/fuse/file.c
 @@ -885,6 +885,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
@@ -723,7 +723,7 @@ index 102d582..c8dc4f3 100644
  		pos += tmp;
  		offset += tmp;
 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index bfaef7bf..9129a32 100644
+index bfaef7bf96b8..9129a32d3934 100644
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
 @@ -1333,7 +1333,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
@@ -740,7 +740,7 @@ index bfaef7bf..9129a32 100644
  	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)
  				|| S_ISLNK(inode->i_mode)))
 diff --git a/fs/splice.c b/fs/splice.c
-index 5c006c8b..9618feb 100644
+index 5c006c8bba5d..9618feb947ca 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -882,6 +882,7 @@ ssize_t __splice_from_pipe(struct pipe_inode_info *pipe, struct splice_desc *sd,
@@ -752,7 +752,7 @@ index 5c006c8b..9618feb 100644
  		if (ret > 0)
  			ret = splice_from_pipe_feed(pipe, sd, actor);
 diff --git a/fs/sysv/Makefile b/fs/sysv/Makefile
-index 3591f9d..7a75e70 100644
+index 3591f9d7a48a..7a75e70a4b61 100644
 --- a/fs/sysv/Makefile
 +++ b/fs/sysv/Makefile
 @@ -5,4 +5,4 @@
@@ -762,7 +762,7 @@ index 3591f9d..7a75e70 100644
 -	     namei.o super.o symlink.o
 +	     namei.o super.o
 diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
-index 9824743..cea8804 100644
+index 9824743832a7..cea880427b0c 100644
 --- a/fs/sysv/inode.c
 +++ b/fs/sysv/inode.c
 @@ -174,14 +174,8 @@ void sysv_set_inode(struct inode *inode, dev_t rdev)
@@ -784,7 +784,7 @@ index 9824743..cea8804 100644
  }
 diff --git a/fs/sysv/symlink.c b/fs/sysv/symlink.c
 deleted file mode 100644
-index 00d2f8a..0000000
+index 00d2f8a43e4e..000000000000
 --- a/fs/sysv/symlink.c
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -809,7 +809,7 @@ index 00d2f8a..0000000
 -	.follow_link	= sysv_follow_link,
 -};
 diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
-index 9a33c5f..f6c229e 100644
+index 9a33c5f7e126..f6c229e2bffa 100644
 --- a/include/linux/enclosure.h
 +++ b/include/linux/enclosure.h
 @@ -29,7 +29,11 @@
@@ -824,8 +824,25 @@ index 9a33c5f..f6c229e 100644
  };
  
  /* ses-2 common element status */
+diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
+index 6c31a2a7c18d..0828194bf4e7 100644
+--- a/include/linux/mmzone.h
++++ b/include/linux/mmzone.h
+@@ -960,6 +960,12 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn)
+ #error Allocator MAX_ORDER exceeds SECTION_SIZE
+ #endif
+ 
++#define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT)
++#define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT)
++
++#define SECTION_ALIGN_UP(pfn)	(((pfn) + PAGES_PER_SECTION - 1) & PAGE_SECTION_MASK)
++#define SECTION_ALIGN_DOWN(pfn)	((pfn) & PAGE_SECTION_MASK)
++
+ struct page;
+ struct page_cgroup;
+ struct mem_section {
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index c282a2c..ae77862 100644
+index c282a2cba635..ae77862160ba 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 @@ -1765,8 +1765,7 @@ extern int	       skb_copy_datagram_iovec(const struct sk_buff *from,
@@ -839,7 +856,7 @@ index c282a2c..ae77862 100644
  						    int offset,
  						    const struct iovec *from,
 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
-index 861045f..faf1d6d 100644
+index 861045fbf936..faf1d6dd0ec6 100644
 --- a/include/net/af_unix.h
 +++ b/include/net/af_unix.h
 @@ -55,10 +55,12 @@ struct unix_sock {
@@ -858,7 +875,7 @@ index 861045f..faf1d6d 100644
  #define unix_sk(__sk) ((struct unix_sock *)__sk)
  
 diff --git a/include/net/sock.h b/include/net/sock.h
-index 78adf52..98f2765 100644
+index 78adf52ca278..98f2765074a2 100644
 --- a/include/net/sock.h
 +++ b/include/net/sock.h
 @@ -231,6 +231,7 @@ struct sock {
@@ -879,7 +896,7 @@ index 78adf52..98f2765 100644
  {
  	nsk->sk_flags = osk->sk_flags;
 diff --git a/kernel/sched.c b/kernel/sched.c
-index 42bf6a6..fe26b86 100644
+index 42bf6a668e91..fe26b86cdbfc 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -2618,7 +2618,6 @@ out:
@@ -891,7 +908,7 @@ index 42bf6a6..fe26b86 100644
  }
  EXPORT_SYMBOL(wake_up_process);
 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
-index f4be464..de19654 100644
+index f4be4649d595..de19654f86ed 100644
 --- a/mm/memory_hotplug.c
 +++ b/mm/memory_hotplug.c
 @@ -601,23 +601,30 @@ int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)
@@ -938,7 +955,7 @@ index f4be464..de19654 100644
  	return 1;
  }
 diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
-index 6b9d62b..c1cf9402 100644
+index 6b9d62b5d820..c1cf94025628 100644
 --- a/net/ax25/af_ax25.c
 +++ b/net/ax25/af_ax25.c
 @@ -805,6 +805,9 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol)
@@ -952,7 +969,7 @@ index 6b9d62b..c1cf9402 100644
  		return -EAFNOSUPPORT;
  
 diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
-index e52443c..735b5fb 100644
+index e52443ce4f9c..735b5fb8e204 100644
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
 @@ -463,6 +463,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
@@ -966,7 +983,7 @@ index e52443c..735b5fb 100644
  
  	if (sk->sk_state != BT_OPEN) {
 diff --git a/net/core/datagram.c b/net/core/datagram.c
-index 767c17a..253d068 100644
+index 767c17aaddcb..253d068e8cba 100644
 --- a/net/core/datagram.c
 +++ b/net/core/datagram.c
 @@ -693,7 +693,6 @@ EXPORT_SYMBOL(__skb_checksum_complete);
@@ -994,7 +1011,7 @@ index 767c17a..253d068 100644
  		return 0;
  
 diff --git a/net/core/scm.c b/net/core/scm.c
-index d98eafc..a128d5d 100644
+index d98eafc7eec3..a128d5db7bdd 100644
 --- a/net/core/scm.c
 +++ b/net/core/scm.c
 @@ -281,6 +281,8 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
@@ -1007,7 +1024,7 @@ index d98eafc..a128d5d 100644
  			msg->msg_controllen -= cmlen;
  		}
 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
-index 5df7b54..7bb3fc3 100644
+index 5df7b5453556..7bb3fc397eea 100644
 --- a/net/decnet/af_decnet.c
 +++ b/net/decnet/af_decnet.c
 @@ -679,6 +679,9 @@ static int dn_create(struct net *net, struct socket *sock, int protocol)
@@ -1021,7 +1038,7 @@ index 5df7b54..7bb3fc3 100644
  		return -EAFNOSUPPORT;
  
 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index d1992a4..2b9b83e 100644
+index d1992a4d166a..2b9b83e1602f 100644
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
 @@ -273,6 +273,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol)
@@ -1035,7 +1052,7 @@ index d1992a4..2b9b83e 100644
  		if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
  			build_ehash_secret();
 diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
-index 04d40ab..0c77c9a 100644
+index 04d40abd9b57..0c77c9a2a729 100644
 --- a/net/ipv4/igmp.c
 +++ b/net/ipv4/igmp.c
 @@ -1841,7 +1841,7 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
@@ -1058,7 +1075,7 @@ index 04d40ab..0c77c9a 100644
  		sock_kfree_s(sk, iml, sizeof(*iml));
  		return 0;
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index d3dcfb9..83c0eae 100644
+index d3dcfb9d736f..83c0eae4d1c8 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
 @@ -4985,7 +4985,7 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen)
@@ -1079,7 +1096,7 @@ index d3dcfb9..83c0eae 100644
  
  		/* RFC1323: The window in SYN & SYN/ACK segments is
 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
-index 83b507d..f12e404 100644
+index 83b507d51968..f12e4046fec4 100644
 --- a/net/ipv4/udp.c
 +++ b/net/ipv4/udp.c
 @@ -941,6 +941,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
@@ -1113,7 +1130,7 @@ index 83b507d..f12e404 100644
  		if (err == -EINVAL)
  			goto csum_copy_err;
 diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
-index 6ff73c4..5b1403d 100644
+index 6ff73c4c126a..5b1403de6392 100644
 --- a/net/ipv6/addrlabel.c
 +++ b/net/ipv6/addrlabel.c
 @@ -557,7 +557,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr* nlh,
@@ -1126,7 +1143,7 @@ index 6ff73c4..5b1403d 100644
  	lseq = ip6addrlbl_table.seq;
  	rcu_read_unlock();
 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
-index 835590d..02d6175 100644
+index 835590d68876..02d6175b42f7 100644
 --- a/net/ipv6/af_inet6.c
 +++ b/net/ipv6/af_inet6.c
 @@ -107,6 +107,9 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol)
@@ -1140,7 +1157,7 @@ index 835590d..02d6175 100644
  	    sock->type != SOCK_DGRAM &&
  	    !inet_ehash_secret)
 diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
-index 7161539..937f915 100644
+index 716153941fc4..937f91569983 100644
 --- a/net/ipv6/ip6mr.c
 +++ b/net/ipv6/ip6mr.c
 @@ -1098,7 +1098,7 @@ reg_pernet_fail:
@@ -1153,7 +1170,7 @@ index 7161539..937f915 100644
  	kmem_cache_destroy(mrt_cachep);
  }
 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index f016542..d5b09c7 100644
+index f016542cf849..d5b09c7ca402 100644
 --- a/net/ipv6/raw.c
 +++ b/net/ipv6/raw.c
 @@ -476,7 +476,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
@@ -1166,7 +1183,7 @@ index f016542..d5b09c7 100644
  			goto csum_copy_err;
  	}
 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 5c8bd19..3f8b3b6 100644
+index 5c8bd19c9572..3f8b3b64c0bd 100644
 --- a/net/ipv6/udp.c
 +++ b/net/ipv6/udp.c
 @@ -198,6 +198,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
@@ -1199,7 +1216,7 @@ index 5c8bd19..3f8b3b6 100644
  			goto csum_copy_err;
  	}
 diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
-index 7cb7613..30ffff8 100644
+index 7cb7613d2ec7..30ffff85155f 100644
 --- a/net/irda/af_irda.c
 +++ b/net/irda/af_irda.c
 @@ -1069,6 +1069,9 @@ static int irda_create(struct net *net, struct socket *sock, int protocol)
@@ -1213,7 +1230,7 @@ index 7cb7613..30ffff8 100644
  		return -EAFNOSUPPORT;
  
 diff --git a/net/rds/connection.c b/net/rds/connection.c
-index 8c3ddcd..cc8b568 100644
+index 8c3ddcdcab93..cc8b568c0c84 100644
 --- a/net/rds/connection.c
 +++ b/net/rds/connection.c
 @@ -187,12 +187,6 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr,
@@ -1230,7 +1247,7 @@ index 8c3ddcd..cc8b568 100644
  
  	ret = trans->conn_alloc(conn, gfp);
 diff --git a/net/rds/send.c b/net/rds/send.c
-index 28c88ff..ad1a2d8 100644
+index 28c88ff3d038..ad1a2d8314c9 100644
 --- a/net/rds/send.c
 +++ b/net/rds/send.c
 @@ -842,11 +842,13 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
@@ -1249,7 +1266,7 @@ index 28c88ff..ad1a2d8 100644
  	rm = rds_message_copy_from_user(msg->msg_iov, payload_len);
  	if (IS_ERR(rm)) {
 diff --git a/net/rfkill/core.c b/net/rfkill/core.c
-index a001f7c..85334a0 100644
+index a001f7c1f711..85334a012781 100644
 --- a/net/rfkill/core.c
 +++ b/net/rfkill/core.c
 @@ -49,7 +49,6 @@
@@ -1286,7 +1303,7 @@ index a001f7c..85334a0 100644
  	rfkill->data = ops_data;
  
 diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c
-index 813e1c4..b6076b2 100644
+index 813e1c482e32..b6076b231b49 100644
 --- a/net/rxrpc/ar-recvmsg.c
 +++ b/net/rxrpc/ar-recvmsg.c
 @@ -184,8 +184,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
@@ -1300,7 +1317,7 @@ index 813e1c4..b6076b2 100644
  				goto csum_copy_error;
  		}
 diff --git a/net/sctp/auth.c b/net/sctp/auth.c
-index 133ce49..b4ce70a 100644
+index 133ce499c593..b4ce70a6ddfb 100644
 --- a/net/sctp/auth.c
 +++ b/net/sctp/auth.c
 @@ -803,8 +803,8 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,
@@ -1315,7 +1332,7 @@ index 133ce49..b4ce70a 100644
  				hmacs->shmac_num_idents * sizeof(__u16));
  	return 0;
 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index c26d905..37daea5 100644
+index c26d9053145f..37daea59da6e 100644
 --- a/net/sctp/socket.c
 +++ b/net/sctp/socket.c
 @@ -6756,6 +6756,9 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
@@ -1329,7 +1346,7 @@ index c26d905..37daea5 100644
  
  /* Populate the fields of the newsk from the oldsk and migrate the assoc
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 79c1dce..8e6a609 100644
+index 79c1dcec66e9..8e6a609ee4fb 100644
 --- a/net/unix/af_unix.c
 +++ b/net/unix/af_unix.c
 @@ -306,6 +306,118 @@ found:
@@ -1601,7 +1618,7 @@ index 79c1dce..8e6a609 100644
  
  	if (writable)
 diff --git a/net/unix/garbage.c b/net/unix/garbage.c
-index cb72e91..de93193 100644
+index cb72e91f1489..de93193cef8d 100644
 --- a/net/unix/garbage.c
 +++ b/net/unix/garbage.c
 @@ -195,7 +195,7 @@ static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),
@@ -1652,7 +1669,7 @@ index cb72e91..de93193 100644
  	}
  
 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
-index b0bd910..80c12c6 100644
+index b0bd910b1de7..80c12c6d779b 100644
 --- a/security/keys/keyctl.c
 +++ b/security/keys/keyctl.c
 @@ -674,16 +674,16 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen)
diff --git a/debian/patches/series/48squeeze19 b/debian/patches/series/48squeeze19
index 86d3f78..aab5052 100644
--- a/debian/patches/series/48squeeze19
+++ b/debian/patches/series/48squeeze19
@@ -20,9 +20,7 @@
 # End of patches to drop for 2.6.32.70
 
 # Add upstream patches
-+ bugfix/all/stable/2.6.32.70-rc1.patch
-# Build fix
-+ bugfix/all/mm-add-section_align_up-and-section_align_down-macro.patch
++ bugfix/all/stable/2.6.32.70.patch
 
 # Fix ABI change (that also conflicts with the following patch)
 + debian/revert-af_unix-fix-a-fatal-race-with-bit-fields.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list