main/linux-virt-grsec: upgrade to 3.10.36

2 files changed, 115 insertions, 142 deletions

diff --git a/main/linux-virt-grsec/APKBUILD b/main/linux-virt-grsec/APKBUILD
index 2daf632bc..e55303575 100644
--- a/main/linux-virt-grsec/APKBUILD
+++ b/main/linux-virt-grsec/APKBUILD
@@ -3,7 +3,7 @@
 
 _flavor=virt-grsec
 pkgname=linux-${_flavor}
-pkgver=3.10.33
+pkgver=3.10.36
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
@@ -153,8 +153,8 @@ dev() {
 }
 
 md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-2a453acf41c3f28122a7cabd3d4acbf5  patch-3.10.33.xz
-2a7c4b66afbcfaaef9d59f45fb34cfd4  grsecurity-2.9.1-3.10.33-unofficial.patch
+19dad5e1e0797edd7278c933bd84ad78  patch-3.10.36.xz
+458bc8540db61a161397e9de2246dea0  grsecurity-2.9.1-3.10.36-unofficial.patch
 a16f11b12381efb3bec79b9bfb329836  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 656ae7b10dd2f18dbfa1011041d08d60  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 aa454ffb96428586447775c21449e284  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -166,8 +166,8 @@ b3c0153d53e508e03d73b94d15b24a96  sysctl_lxc.patch
 539c848d541c1656851fe865018273df  kernelconfig.x86
 82cd965fc82651f2e6b35e75c17d8031  kernelconfig.x86_64"
 sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544  linux-3.10.tar.xz
-4ba2db5d2c54cff38cbbbff940e9a45969ccea675fc1cf78a4e665dd8f97468e  patch-3.10.33.xz
-1b2bc6cfd2fc355790c8c3393cb99068bdd796516a69a54045824984e2ca58b1  grsecurity-2.9.1-3.10.33-unofficial.patch
+76d7e401c32f85a7943ad9a91d4007ef5a09c014087038ede884d129255cd24b  patch-3.10.36.xz
+5e35f1094419ae19f95cd5b13bf4b428c5b7b6209e512750a83ae76b79062c3c  grsecurity-2.9.1-3.10.36-unofficial.patch
 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -179,8 +179,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e  0006-ipv4-use-
 997d4c8a5a2b911047d26fe1bf8ee8d5cd3b7133e6abdc07b7deacd0b3eb2330  kernelconfig.x86
 7845194551137fbc3b69a75249696bc843bb7fe7f4a4e6b0582c0ca0856caa64  kernelconfig.x86_64"
 sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35  linux-3.10.tar.xz
-546a27783e1e42ed07701e428a23bf1d3ebaa19f9cdb13197f481a297bfc4fd96b0fed2fc6557c72dbdbd38708cc4573e1d53f56445ab9da9d44edfc9ece88ce  patch-3.10.33.xz
-652639e8b8e45380a8ee021a50deac665aab986a0f2092a1057f24e135a8d1a0f3c48e1f83a502ca051760b1f3e3ab95d16dab95a3b0f93dde6273093ee6b29d  grsecurity-2.9.1-3.10.33-unofficial.patch
+7e0464c4e6b82cf3db4835b2ec9f232a2a2b979f12cb089e63fdb5f1cb11d6abe6b3a0614058eaef8c7b2d4046b7311dde361ff62e32b5908a93430699750483  patch-3.10.36.xz
+8bdd1db67136ae9edfd35d232929a0ae4bdc7caee50984e86c11f1af60474b27becc2acd570cd509beca55e7d15a9f4bc43956f6a75a3fe7e3013dded9fab8a0  grsecurity-2.9.1-3.10.36-unofficial.patch
 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
diff --git a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.33-unofficial.patch b/main/linux-virt-grsec/grsecurity-2.9.1-3.10.36-unofficial.patch
index 34ff6783e..8a30a16d2 100644
--- a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.33-unofficial.patch
+++ b/main/linux-virt-grsec/grsecurity-2.9.1-3.10.36-unofficial.patch
@@ -281,7 +281,7 @@ index 1311a48..f233324 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index 1e602eb..d847dbc 100644
+index b5f4ef3..f70bdec 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -1795,7 +1795,7 @@ index 2fe141f..192dc01 100644
  #ifdef CONFIG_MMU
  extern void iotable_init(struct map_desc *, int);
 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
-index 12f71a1..04e063c 100644
+index f94784f..9a09a4a 100644
 --- a/arch/arm/include/asm/outercache.h
 +++ b/arch/arm/include/asm/outercache.h
 @@ -35,7 +35,7 @@ struct outer_cache_fns {
@@ -1805,7 +1805,7 @@ index 12f71a1..04e063c 100644
 -};
 +} __no_const;
  
- #ifdef CONFIG_OUTER_CACHE
+ extern struct outer_cache_fns outer_cache;
  
 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
 index cbdc7a2..32f44fe 100644
@@ -3026,7 +3026,7 @@ index 03deeff..741ce88 100644
  	if (secure_computing(scno) == -1)
  		return -1;
 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index b4b1d39..efdc9be 100644
+index eb83bcc..b0d6dcc 100644
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
 @@ -97,21 +97,23 @@ EXPORT_SYMBOL(system_serial_high);
@@ -22851,7 +22851,7 @@ index 55b6761..a6456fc 100644
  	init_level4_pgt[511] = early_level4_pgt[511];
  
 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index 73afd11..0ef46f2 100644
+index df63cae..760553d 100644
 --- a/arch/x86/kernel/head_32.S
 +++ b/arch/x86/kernel/head_32.S
 @@ -26,6 +26,12 @@
@@ -23074,16 +23074,16 @@ index 73afd11..0ef46f2 100644
  	movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
  	shrl $16, %ecx
  	movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -566,7 +651,7 @@ ENDPROC(early_idt_handlers)
- 	/* This is global to keep gas from relaxing the jumps */
- ENTRY(early_idt_handler)
- 	cld
+@@ -570,7 +655,7 @@ ENTRY(early_idt_handler)
+ 	cmpl $2,(%esp)		# X86_TRAP_NMI
+ 	je is_nmi		# Ignore NMI
+ 
 -	cmpl $2,%ss:early_recursion_flag
 +	cmpl $1,%ss:early_recursion_flag
  	je hlt_loop
  	incl %ss:early_recursion_flag
  
-@@ -604,8 +689,8 @@ ENTRY(early_idt_handler)
+@@ -608,8 +693,8 @@ ENTRY(early_idt_handler)
  	pushl (20+6*4)(%esp)	/* trapno */
  	pushl $fault_msg
  	call printk
@@ -23093,7 +23093,7 @@ index 73afd11..0ef46f2 100644
  hlt_loop:
  	hlt
  	jmp hlt_loop
-@@ -624,8 +709,11 @@ ENDPROC(early_idt_handler)
+@@ -629,8 +714,11 @@ ENDPROC(early_idt_handler)
  /* This is the default interrupt "handler" :-) */
  	ALIGN
  ignore_int:
@@ -23106,7 +23106,7 @@ index 73afd11..0ef46f2 100644
  	pushl %eax
  	pushl %ecx
  	pushl %edx
-@@ -634,9 +722,6 @@ ignore_int:
+@@ -639,9 +727,6 @@ ignore_int:
  	movl $(__KERNEL_DS),%eax
  	movl %eax,%ds
  	movl %eax,%es
@@ -23116,7 +23116,7 @@ index 73afd11..0ef46f2 100644
  	pushl 16(%esp)
  	pushl 24(%esp)
  	pushl 32(%esp)
-@@ -670,29 +755,43 @@ ENTRY(setup_once_ref)
+@@ -675,29 +760,43 @@ ENTRY(setup_once_ref)
  /*
   * BSS section
   */
@@ -23165,7 +23165,7 @@ index 73afd11..0ef46f2 100644
  ENTRY(initial_page_table)
  	.long	pa(initial_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */
  # if KPMDS == 3
-@@ -711,12 +810,20 @@ ENTRY(initial_page_table)
+@@ -716,12 +815,20 @@ ENTRY(initial_page_table)
  #  error "Kernel PMDs should be 1, 2 or 3"
  # endif
  	.align PAGE_SIZE		/* needs to be page-sized too */
@@ -23187,7 +23187,7 @@ index 73afd11..0ef46f2 100644
  
  __INITRODATA
  int_msg:
-@@ -744,7 +851,7 @@ fault_msg:
+@@ -749,7 +856,7 @@ fault_msg:
   * segment size, and 32-bit linear address value:
   */
  
@@ -23196,7 +23196,7 @@ index 73afd11..0ef46f2 100644
  .globl boot_gdt_descr
  .globl idt_descr
  
-@@ -753,7 +860,7 @@ fault_msg:
+@@ -758,7 +865,7 @@ fault_msg:
  	.word 0				# 32 bit align gdt_desc.address
  boot_gdt_descr:
  	.word __BOOT_DS+7
@@ -23205,7 +23205,7 @@ index 73afd11..0ef46f2 100644
  
  	.word 0				# 32-bit align idt_desc.address
  idt_descr:
-@@ -764,7 +871,7 @@ idt_descr:
+@@ -769,7 +876,7 @@ idt_descr:
  	.word 0				# 32 bit align gdt_desc.address
  ENTRY(early_gdt_descr)
  	.word GDT_ENTRIES*8-1
@@ -23214,7 +23214,7 @@ index 73afd11..0ef46f2 100644
  
  /*
   * The boot_gdt must mirror the equivalent in setup.S and is
-@@ -773,5 +880,65 @@ ENTRY(early_gdt_descr)
+@@ -778,5 +885,65 @@ ENTRY(early_gdt_descr)
  	.align L1_CACHE_BYTES
  ENTRY(boot_gdt)
  	.fill GDT_ENTRY_BOOT_CS,8,0
@@ -23283,7 +23283,7 @@ index 73afd11..0ef46f2 100644
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
-index a836860..1b5c665 100644
+index f2a9a2a..60d6e5c 100644
 --- a/arch/x86/kernel/head_64.S
 +++ b/arch/x86/kernel/head_64.S
 @@ -20,6 +20,8 @@
@@ -23374,7 +23374,7 @@ index a836860..1b5c665 100644
  	movq	initial_code(%rip),%rax
  	pushq	$0		# fake return address to stop unwinder
  	pushq	$__KERNEL_CS	# set correct cs
-@@ -388,7 +417,7 @@ ENTRY(early_idt_handler)
+@@ -391,7 +420,7 @@ ENTRY(early_idt_handler)
  	call dump_stack
  #ifdef CONFIG_KALLSYMS	
  	leaq early_idt_ripmsg(%rip),%rdi
@@ -23383,7 +23383,7 @@ index a836860..1b5c665 100644
  	call __print_symbol
  #endif
  #endif /* EARLY_PRINTK */
-@@ -416,6 +445,7 @@ ENDPROC(early_idt_handler)
+@@ -420,6 +449,7 @@ ENDPROC(early_idt_handler)
  early_recursion_flag:
  	.long 0
  
@@ -23391,7 +23391,7 @@ index a836860..1b5c665 100644
  #ifdef CONFIG_EARLY_PRINTK
  early_idt_msg:
  	.asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
-@@ -443,29 +473,52 @@ NEXT_PAGE(early_level4_pgt)
+@@ -447,29 +477,52 @@ NEXT_PAGE(early_level4_pgt)
  NEXT_PAGE(early_dynamic_pgts)
  	.fill	512*EARLY_DYNAMIC_PAGE_TABLES,8,0
  
@@ -23453,7 +23453,7 @@ index a836860..1b5c665 100644
  
  NEXT_PAGE(level3_kernel_pgt)
  	.fill	L3_START_KERNEL,8,0
-@@ -473,6 +526,9 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -477,6 +530,9 @@ NEXT_PAGE(level3_kernel_pgt)
  	.quad	level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
  	.quad	level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -23463,7 +23463,7 @@ index a836860..1b5c665 100644
  NEXT_PAGE(level2_kernel_pgt)
  	/*
  	 * 512 MB kernel mapping. We spend a full page on this pagetable
-@@ -488,39 +544,70 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -492,39 +548,70 @@ NEXT_PAGE(level2_kernel_pgt)
  		KERNEL_IMAGE_SIZE/PMD_SIZE)
  
  NEXT_PAGE(level2_fixmap_pgt)
@@ -23579,7 +23579,7 @@ index 0fa6912..b37438b 100644
 +EXPORT_SYMBOL(cpu_pgd);
 +#endif
 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index f7ea30d..6318acc 100644
+index b03ff18..b559637 100644
 --- a/arch/x86/kernel/i387.c
 +++ b/arch/x86/kernel/i387.c
 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
@@ -26874,7 +26874,7 @@ index 61d9fed..028cc826 100644
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index da20860..d19fdf5 100644
+index 7e6090e..b0d0f16 100644
 --- a/arch/x86/kvm/paging_tmpl.h
 +++ b/arch/x86/kvm/paging_tmpl.h
 @@ -208,7 +208,7 @@ retry_walk:
@@ -26887,10 +26887,10 @@ index da20860..d19fdf5 100644
  			goto error;
  		walker->ptep_user[walker->level - 1] = ptep_user;
 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index a14a6ea..dc86cf0 100644
+index 765210d..62a1e12 100644
 --- a/arch/x86/kvm/svm.c
 +++ b/arch/x86/kvm/svm.c
-@@ -3493,7 +3493,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+@@ -3491,7 +3491,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
  	int cpu = raw_smp_processor_id();
  
  	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -26914,7 +26914,7 @@ index a14a6ea..dc86cf0 100644
  
  	local_irq_disable();
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 5402c94..c3bdeee 100644
+index 7cdafb6..33b4fb6 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
 @@ -1311,12 +1311,12 @@ static void vmcs_write64(unsigned long field, u64 value)
@@ -32503,7 +32503,7 @@ index 0000000..dace51c
 +EXPORT_SYMBOL(__pax_close_userland);
 +#endif
 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
-index 877b9a1..a8ecf42 100644
+index 0149575..f746de8 100644
 --- a/arch/x86/net/bpf_jit.S
 +++ b/arch/x86/net/bpf_jit.S
 @@ -9,6 +9,7 @@
@@ -35123,7 +35123,7 @@ index 8905e03..d1b0719 100644
  				unsigned long timeout_msec)
  {
 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 15518fd..78ebdbe 100644
+index 8b8cbe9..a6fb17a 100644
 --- a/drivers/ata/libata-core.c
 +++ b/drivers/ata/libata-core.c
 @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
@@ -35135,7 +35135,7 @@ index 15518fd..78ebdbe 100644
  
  struct ata_force_param {
  	const char	*name;
-@@ -4823,7 +4823,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4824,7 +4824,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	unsigned int tag;
  
@@ -35144,7 +35144,7 @@ index 15518fd..78ebdbe 100644
  	ap = qc->ap;
  
  	qc->flags = 0;
-@@ -4839,7 +4839,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4840,7 +4840,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	struct ata_link *link;
  
@@ -35153,7 +35153,7 @@ index 15518fd..78ebdbe 100644
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5957,6 +5957,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5958,6 +5958,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		return;
  
  	spin_lock(&lock);
@@ -35161,7 +35161,7 @@ index 15518fd..78ebdbe 100644
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5970,8 +5971,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5971,8 +5972,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
@@ -35172,7 +35172,7 @@ index 15518fd..78ebdbe 100644
  	spin_unlock(&lock);
  }
  
-@@ -6164,7 +6166,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
+@@ -6165,7 +6167,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
  
  	/* give ports names and add SCSI hosts */
  	for (i = 0; i < host->n_ports; i++)
@@ -38252,7 +38252,7 @@ index 57ea7f4..af06b76 100644
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
-index 664a6ff..af13580 100644
+index 392ad51..e68d635 100644
 --- a/drivers/firewire/core-device.c
 +++ b/drivers/firewire/core-device.c
 @@ -232,7 +232,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
@@ -41307,10 +41307,10 @@ index 2f0b39d..7370f13 100644
  
  ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index 4c842c3..590b0bf 100644
+index b604564..3f14ae4 100644
 --- a/drivers/input/mousedev.c
 +++ b/drivers/input/mousedev.c
-@@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
+@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
  
  	spin_unlock_irq(&client->packet_lock);
  
@@ -42694,10 +42694,10 @@ index 1cf382a..c22998c 100644
  	dev_set_drvdata(&dev->dev, dev);
  	rc = device_add(&dev->dev);
 diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
-index 20e345d..da56fe4 100644
+index a1c641e..3007da9 100644
 --- a/drivers/media/usb/dvb-usb/cxusb.c
 +++ b/drivers/media/usb/dvb-usb/cxusb.c
-@@ -1101,7 +1101,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
+@@ -1112,7 +1112,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
  
  struct dib0700_adapter_state {
  	int (*set_param_save) (struct dvb_frontend *);
@@ -42707,7 +42707,7 @@ index 20e345d..da56fe4 100644
  static int dib7070_set_param_override(struct dvb_frontend *fe)
  {
 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
-index 71b22f5..a63b33f 100644
+index 4170a45..8d602b2 100644
 --- a/drivers/media/usb/dvb-usb/dw2102.c
 +++ b/drivers/media/usb/dvb-usb/dw2102.c
 @@ -121,7 +121,7 @@ struct su3000_state {
@@ -43728,7 +43728,7 @@ index 43c00bc..dd1d03d 100644
  /**
   * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
-index ff6e30e..87e8452 100644
+index 046059c..9c7d3db 100644
 --- a/drivers/net/ethernet/broadcom/tg3.h
 +++ b/drivers/net/ethernet/broadcom/tg3.h
 @@ -147,6 +147,7 @@
@@ -43972,7 +43972,7 @@ index e9b5d77a..1898ba7 100644
  	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
  	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
-index 9a95abf..36df7f9 100644
+index 540ad16..4cd4415 100644
 --- a/drivers/net/ethernet/sfc/ptp.c
 +++ b/drivers/net/ethernet/sfc/ptp.c
 @@ -535,7 +535,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
@@ -45700,10 +45700,10 @@ index 29178f7..c65f324 100644
  		__power_supply_attrs[i] = &power_supply_attrs[i].attr;
  }
 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index 815d6df..811633a 100644
+index a86d123..cbf56c3 100644
 --- a/drivers/regulator/core.c
 +++ b/drivers/regulator/core.c
-@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3526,7 +3526,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  {
  	const struct regulation_constraints *constraints = NULL;
  	const struct regulator_init_data *init_data;
@@ -45712,7 +45712,7 @@ index 815d6df..811633a 100644
  	struct regulator_dev *rdev;
  	struct device *dev;
  	int ret, i;
-@@ -3599,7 +3599,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3596,7 +3596,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  	rdev->dev.of_node = config->of_node;
  	rdev->dev.parent = dev;
  	dev_set_name(&rdev->dev, "regulator.%d",
@@ -57882,7 +57882,7 @@ index cb424a4..850e4dd 100644
  
  	lock_flocks();
 diff --git a/fs/namei.c b/fs/namei.c
-index cccaf77..b28ec8a 100644
+index 1211ee5..0e8539c 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
@@ -58407,8 +58407,8 @@ index cccaf77..b28ec8a 100644
 +	putname(to);
  	done_path_create(&new_path, new_dentry);
  	if (retry_estale(error, how)) {
- 		how |= LOOKUP_REVAL;
-@@ -3898,12 +4088,21 @@ retry:
+ 		path_put(&old_path);
+@@ -3899,12 +4089,21 @@ retry:
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -58430,7 +58430,7 @@ index cccaf77..b28ec8a 100644
  exit5:
  	dput(new_dentry);
  exit4:
-@@ -3935,6 +4134,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -3936,6 +4135,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -58439,7 +58439,7 @@ index cccaf77..b28ec8a 100644
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3944,7 +4145,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
+@@ -3945,7 +4146,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -58948,7 +58948,7 @@ index 20dfec7..e238cb7 100644
  		if (ret) {
  			mlog_errno(ret);
 diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
-index ff54014..ff125fd 100644
+index 46387e4..2b8d78f 100644
 --- a/fs/ocfs2/file.c
 +++ b/fs/ocfs2/file.c
 @@ -370,7 +370,7 @@ static int ocfs2_cow_file_pos(struct inode *inode,
@@ -59811,7 +59811,7 @@ index cbd0f1b..adec3f0 100644
  static struct pid *
  get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index c3834da..b402b2b 100644
+index de12b81..72b8f99 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
 @@ -113,6 +113,14 @@ struct pid_entry {
@@ -60120,7 +60120,7 @@ index c3834da..b402b2b 100644
  			rcu_read_unlock();
  		} else {
  			inode->i_uid = GLOBAL_ROOT_UID;
-@@ -2196,6 +2314,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+@@ -2197,6 +2315,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
  	if (!task)
  		goto out_no_task;
  
@@ -60130,7 +60130,7 @@ index c3834da..b402b2b 100644
  	/*
  	 * Yes, it does not scale. And it should not. Don't add
  	 * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2240,6 +2361,9 @@ static int proc_pident_readdir(struct file *filp,
+@@ -2241,6 +2362,9 @@ static int proc_pident_readdir(struct file *filp,
  	if (!task)
  		goto out_no_task;
  
@@ -60140,7 +60140,7 @@ index c3834da..b402b2b 100644
  	ret = 0;
  	i = filp->f_pos;
  	switch (i) {
-@@ -2653,7 +2777,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2654,7 +2778,7 @@ static const struct pid_entry tgid_base_stuff[] = {
  	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
  #endif
  	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -60149,7 +60149,7 @@ index c3834da..b402b2b 100644
  	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2678,10 +2802,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2679,10 +2803,10 @@ static const struct pid_entry tgid_base_stuff[] = {
  #ifdef CONFIG_SECURITY
  	DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -60162,7 +60162,7 @@ index c3834da..b402b2b 100644
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2715,6 +2839,9 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2716,6 +2840,9 @@ static const struct pid_entry tgid_base_stuff[] = {
  #ifdef CONFIG_HARDWALL
  	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
@@ -60172,7 +60172,7 @@ index c3834da..b402b2b 100644
  #ifdef CONFIG_USER_NS
  	REG("uid_map",    S_IRUGO|S_IWUSR, proc_uid_map_operations),
  	REG("gid_map",    S_IRUGO|S_IWUSR, proc_gid_map_operations),
-@@ -2847,7 +2974,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
+@@ -2848,7 +2975,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
  	if (!inode)
  		goto out;
  
@@ -60187,7 +60187,7 @@ index c3834da..b402b2b 100644
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -2885,7 +3019,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
+@@ -2886,7 +3020,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
  	if (!task)
  		goto out;
  
@@ -60199,7 +60199,7 @@ index c3834da..b402b2b 100644
  	put_task_struct(task);
  out:
  	return result;
-@@ -2948,6 +3086,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
+@@ -2949,6 +3087,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
  static int fake_filldir(void *buf, const char *name, int namelen,
  			loff_t offset, u64 ino, unsigned d_type)
  {
@@ -60208,7 +60208,7 @@ index c3834da..b402b2b 100644
  	return 0;
  }
  
-@@ -3007,7 +3147,7 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3008,7 +3148,7 @@ static const struct pid_entry tid_base_stuff[] = {
  	REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
  	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -60217,7 +60217,7 @@ index c3834da..b402b2b 100644
  	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3034,10 +3174,10 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3035,10 +3175,10 @@ static const struct pid_entry tid_base_stuff[] = {
  #ifdef CONFIG_SECURITY
  	DIR("attr",      S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -75716,7 +75716,7 @@ index 2913b86..8dcbb1e 100644
  	u32 remainder;
  	return div_u64_rem(dividend, divisor, &remainder);
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 3bf21c3..f9723f5 100644
+index a9a4830..292116d 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -104,6 +104,11 @@ extern unsigned int kobjsize(const void *objp);
@@ -75750,7 +75750,7 @@ index 3bf21c3..f9723f5 100644
  
  struct mmu_gather;
  struct inode;
-@@ -983,8 +989,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+@@ -993,8 +999,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
  	unsigned long *pfn);
  int follow_phys(struct vm_area_struct *vma, unsigned long address,
  		unsigned int flags, unsigned long *prot, resource_size_t *phys);
@@ -75761,7 +75761,7 @@ index 3bf21c3..f9723f5 100644
  
  static inline void unmap_shared_mapping_range(struct address_space *mapping,
  		loff_t const holebegin, loff_t const holelen)
-@@ -1023,9 +1029,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1033,9 +1039,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -75774,7 +75774,7 @@ index 3bf21c3..f9723f5 100644
  
  long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  		      unsigned long start, unsigned long nr_pages,
-@@ -1056,34 +1062,6 @@ int set_page_dirty(struct page *page);
+@@ -1066,34 +1072,6 @@ int set_page_dirty(struct page *page);
  int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  
@@ -75809,7 +75809,7 @@ index 3bf21c3..f9723f5 100644
  extern pid_t
  vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
  
-@@ -1183,6 +1161,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
+@@ -1193,6 +1171,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
  }
  #endif
  
@@ -75825,7 +75825,7 @@ index 3bf21c3..f9723f5 100644
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1201,8 +1188,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1211,8 +1198,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
  {
  	return 0;
  }
@@ -75841,7 +75841,7 @@ index 3bf21c3..f9723f5 100644
  #endif
  
  #ifdef __PAGETABLE_PMD_FOLDED
-@@ -1211,8 +1205,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
+@@ -1221,8 +1215,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
  {
  	return 0;
  }
@@ -75857,7 +75857,7 @@ index 3bf21c3..f9723f5 100644
  #endif
  
  int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1230,11 +1231,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+@@ -1240,11 +1241,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
  		NULL: pud_offset(pgd, address);
  }
  
@@ -75881,7 +75881,7 @@ index 3bf21c3..f9723f5 100644
  #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
  
  #if USE_SPLIT_PTLOCKS
-@@ -1520,6 +1533,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1530,6 +1543,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot, unsigned long flags,
  	unsigned long pgoff, unsigned long *populate);
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -75889,7 +75889,7 @@ index 3bf21c3..f9723f5 100644
  
  #ifdef CONFIG_MMU
  extern int __mm_populate(unsigned long addr, unsigned long len,
-@@ -1548,10 +1562,11 @@ struct vm_unmapped_area_info {
+@@ -1558,10 +1572,11 @@ struct vm_unmapped_area_info {
  	unsigned long high_limit;
  	unsigned long align_mask;
  	unsigned long align_offset;
@@ -75903,7 +75903,7 @@ index 3bf21c3..f9723f5 100644
  
  /*
   * Search for an unmapped address range.
-@@ -1563,7 +1578,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
+@@ -1573,7 +1588,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
   * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
   */
  static inline unsigned long
@@ -75912,7 +75912,7 @@ index 3bf21c3..f9723f5 100644
  {
  	if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
  		return unmapped_area(info);
-@@ -1626,6 +1641,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1636,6 +1651,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
  					     struct vm_area_struct **pprev);
  
@@ -75923,7 +75923,7 @@ index 3bf21c3..f9723f5 100644
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1654,15 +1673,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
+@@ -1664,15 +1683,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
  	return vma;
  }
  
@@ -75939,7 +75939,7 @@ index 3bf21c3..f9723f5 100644
  #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
  unsigned long change_prot_numa(struct vm_area_struct *vma,
  			unsigned long start, unsigned long end);
-@@ -1714,6 +1724,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
+@@ -1724,6 +1734,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
  static inline void vm_stat_account(struct mm_struct *mm,
  			unsigned long flags, struct file *file, long pages)
  {
@@ -75951,7 +75951,7 @@ index 3bf21c3..f9723f5 100644
  	mm->total_vm += pages;
  }
  #endif /* CONFIG_PROC_FS */
-@@ -1794,7 +1809,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -1804,7 +1819,7 @@ extern int unpoison_memory(unsigned long pfn);
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
  extern void shake_page(struct page *p, int access);
@@ -75960,7 +75960,7 @@ index 3bf21c3..f9723f5 100644
  extern int soft_offline_page(struct page *page, int flags);
  
  extern void dump_page(struct page *page);
-@@ -1831,5 +1846,11 @@ void __init setup_nr_node_ids(void);
+@@ -1841,5 +1856,11 @@ void __init setup_nr_node_ids(void);
  static inline void setup_nr_node_ids(void) {}
  #endif
  
@@ -76650,7 +76650,7 @@ index 4ea1d37..80f4b33 100644
  /*
   * The return value from decompress routine is the length of the
 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index f5d4723..a6ea2fa 100644
+index f5d4723..a6ea2fa5 100644
 --- a/include/linux/preempt.h
 +++ b/include/linux/preempt.h
 @@ -18,8 +18,13 @@
@@ -78887,7 +78887,7 @@ index cec4c72..66ba735 100644
  /**
   * sk_page_frag - return an appropriate page_frag
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 3fc77e9..a20155c 100644
+index 6f87f08..0331fde 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -525,7 +525,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
@@ -80065,7 +80065,7 @@ index bb0248f..930acfc 100644
  		if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
 diff --git a/ipc/msg.c b/ipc/msg.c
-index 558aa91..359e718 100644
+index 52770bf..1c60a6f 100644
 --- a/ipc/msg.c
 +++ b/ipc/msg.c
 @@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
@@ -84200,7 +84200,7 @@ index 1d96dd0..994ff19 100644
  
  	default:
 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
-index 64de5f8..7735e12 100644
+index 4a07353..66b5291 100644
 --- a/kernel/sched/auto_group.c
 +++ b/kernel/sched/auto_group.c
 @@ -11,7 +11,7 @@
@@ -84212,7 +84212,7 @@ index 64de5f8..7735e12 100644
  
  void __init autogroup_init(struct task_struct *init_task)
  {
-@@ -81,7 +81,7 @@ static inline struct autogroup *autogroup_create(void)
+@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
  
  	kref_init(&ag->kref);
  	init_rwsem(&ag->lock);
@@ -84403,7 +84403,7 @@ index b4308d7..9da0717 100644
  	.priority = CPU_PRI_MIGRATION,
  };
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 305ef88..bfc7419 100644
+index c7ab8ea..74ef072 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
 @@ -831,7 +831,7 @@ void task_numa_fault(int node, int pages, bool migrated)
@@ -85774,10 +85774,10 @@ index 26dc348..8708ca7 100644
 +	return atomic64_inc_return_unchecked(&trace_counter);
  }
 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 3d18aad..d1be0eb 100644
+index 001b349..9004eb9 100644
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
-@@ -1794,10 +1794,6 @@ static LIST_HEAD(ftrace_module_file_list);
+@@ -1788,10 +1788,6 @@ static LIST_HEAD(ftrace_module_file_list);
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -85788,7 +85788,7 @@ index 3d18aad..d1be0eb 100644
  };
  
  static struct ftrace_module_file_ops *
-@@ -1838,17 +1834,12 @@ trace_create_file_ops(struct module *mod)
+@@ -1832,17 +1828,12 @@ trace_create_file_ops(struct module *mod)
  
  	file_ops->mod = mod;
  
@@ -85812,7 +85812,7 @@ index 3d18aad..d1be0eb 100644
  
  	list_add(&file_ops->list, &ftrace_module_file_list);
  
-@@ -1941,8 +1932,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
+@@ -1945,8 +1936,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
  			  struct ftrace_module_file_ops *file_ops)
  {
  	return __trace_add_new_event(call, tr,
@@ -87075,7 +87075,7 @@ index 7055883..aafb1ed 100644
  	if (end == start)
  		return error;
 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index e386bee..2a8fe2c 100644
+index 59c62fa..124de80 100644
 --- a/mm/memory-failure.c
 +++ b/mm/memory-failure.c
 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
@@ -89784,7 +89784,7 @@ index 73cbc5d..a278f9d 100644
  	.next		= NULL,
  };
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 2ee0fd3..6e2edfb 100644
+index 0ab02fb..1687585 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -60,6 +60,7 @@
@@ -89804,7 +89804,7 @@ index 2ee0fd3..6e2edfb 100644
  {
  	__free_pages_ok(page, compound_order(page));
  }
-@@ -702,6 +703,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -704,6 +705,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  	int i;
  	int bad = 0;
  
@@ -89815,7 +89815,7 @@ index 2ee0fd3..6e2edfb 100644
  	trace_mm_page_free(page, order);
  	kmemcheck_free_shadow(page, order);
  
-@@ -717,6 +722,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -719,6 +724,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  		debug_check_no_obj_freed(page_address(page),
  					   PAGE_SIZE << order);
  	}
@@ -89828,7 +89828,7 @@ index 2ee0fd3..6e2edfb 100644
  	arch_free_page(page, order);
  	kernel_map_pages(page, 1 << order, 0);
  
-@@ -739,6 +750,19 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -741,6 +752,19 @@ static void __free_pages_ok(struct page *page, unsigned int order)
  	local_irq_restore(flags);
  }
  
@@ -89848,7 +89848,7 @@ index 2ee0fd3..6e2edfb 100644
  /*
   * Read access to zone->managed_pages is safe because it's unsigned long,
   * but we still need to serialize writers. Currently all callers of
-@@ -761,6 +785,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
+@@ -763,6 +787,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
  		set_page_count(p, 0);
  	}
  
@@ -89868,7 +89868,7 @@ index 2ee0fd3..6e2edfb 100644
  	page_zone(page)->managed_pages += 1 << order;
  	set_page_refcounted(page);
  	__free_pages(page, order);
-@@ -870,8 +907,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+@@ -872,8 +909,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
  	arch_alloc_page(page, order);
  	kernel_map_pages(page, 1 << order, 1);
  
@@ -91165,7 +91165,7 @@ index 1c91f0d3..485470a 100644
  		}
  	}
 diff --git a/mm/swap.c b/mm/swap.c
-index ea58dbd..1739476 100644
+index 4e35f3f..3a5e850 100644
 --- a/mm/swap.c
 +++ b/mm/swap.c
 @@ -74,6 +74,8 @@ static void __put_compound_page(struct page *page)
@@ -92619,7 +92619,7 @@ index 9a31515..4fd45a6 100644
  
  	m->msg_iov = iov;
 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 49aeab8..f73c2ce 100644
+index b49e8ba..497d054 100644
 --- a/net/core/neighbour.c
 +++ b/net/core/neighbour.c
 @@ -2773,7 +2773,7 @@ static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer,
@@ -95495,18 +95495,9 @@ index 0ab9636..cea3c6a 100644
  {
  	if (users > 0)
 diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
-index a99b6c3..cb372f9 100644
+index 59359be..cb372f9 100644
 --- a/net/netfilter/nf_conntrack_proto_dccp.c
 +++ b/net/netfilter/nf_conntrack_proto_dccp.c
-@@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
- 	const char *msg;
- 	u_int8_t state;
- 
--	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
-+	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
- 	BUG_ON(dh == NULL);
- 
- 	state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
 @@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
  out_invalid:
  	if (LOG_INVALID(net, IPPROTO_DCCP))
@@ -95516,24 +95507,6 @@ index a99b6c3..cb372f9 100644
  	return false;
  }
  
-@@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
- 	u_int8_t type, old_state, new_state;
- 	enum ct_dccp_roles role;
- 
--	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
-+	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
- 	BUG_ON(dh == NULL);
- 	type = dh->dccph_type;
- 
-@@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
- 	unsigned int cscov;
- 	const char *msg;
- 
--	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
-+	dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
- 	if (dh == NULL) {
- 		msg = "nf_ct_dccp: short packet ";
- 		goto out_invalid;
 @@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
  
  out_invalid:
@@ -97377,10 +97350,10 @@ index 6b42d47..2ac24d5 100644
  
  	sub->evt.event = htohl(event, sub->swap);
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 3ca7927..f8bc389 100644
+index 94d3347..d0c06b5 100644
 --- a/net/unix/af_unix.c
 +++ b/net/unix/af_unix.c
-@@ -789,6 +789,12 @@ static struct sock *unix_find_other(struct net *net,
+@@ -788,6 +788,12 @@ static struct sock *unix_find_other(struct net *net,
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -97393,7 +97366,7 @@ index 3ca7927..f8bc389 100644
  		u = unix_find_socket_byinode(inode);
  		if (!u)
  			goto put_fail;
-@@ -809,6 +815,13 @@ static struct sock *unix_find_other(struct net *net,
+@@ -808,6 +814,13 @@ static struct sock *unix_find_other(struct net *net,
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->path.dentry;
@@ -97407,7 +97380,7 @@ index 3ca7927..f8bc389 100644
  			if (dentry)
  				touch_atime(&unix_sk(u)->path);
  		} else
-@@ -842,12 +855,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
+@@ -841,12 +854,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
  	 */
  	err = security_path_mknod(&path, dentry, mode, 0);
  	if (!err) {
@@ -97426,7 +97399,7 @@ index 3ca7927..f8bc389 100644
  	done_path_create(&path, dentry);
  	return err;
  }
-@@ -2337,9 +2356,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2336,9 +2355,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  		seq_puts(seq, "Num       RefCount Protocol Flags    Type St "
  			 "Inode Path\n");
  	else {
@@ -97441,7 +97414,7 @@ index 3ca7927..f8bc389 100644
  
  		seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
  			s,
-@@ -2366,8 +2389,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2365,8 +2388,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  			}
  			for ( ; i < len; i++)
  				seq_putc(seq, u->addr->name->sun_path[i]);
@@ -98169,7 +98142,7 @@ index 9dfcd6d..099068e 100644
  			filename, strerror(errno));
  		goto out;
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index acb8650..b8c5f02 100644
+index 3001ec5..9d399d8 100644
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
 @@ -246,6 +246,7 @@ fi
@@ -111763,7 +111736,7 @@ index 96b919d..c49bb74 100644
 +
  #endif
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index eb99458..634c3ec 100644
+index 8cf1cd2..caa7801 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -75,12 +75,17 @@ LIST_HEAD(vm_list);