kernel: refresh generic patches

Signed-off-by: John Crispin <[email protected]>

SVN-Revision: 41352

target/linux/generic/patches-3.10/020-ssb_update.patch

@@ -169,7 +169,7 @@
  static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)
  {
  	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
-@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct 
+@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct
  	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
  }
  

target/linux/generic/patches-3.10/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch

@@ -41,8 +41,6 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  7 files changed, 718 insertions(+)
  create mode 100644 drivers/mtd/ubi/block.c
 
-diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
-index 36663af..783fb18 100644
 --- a/drivers/mtd/ubi/Kconfig
 +++ b/drivers/mtd/ubi/Kconfig
 @@ -87,4 +87,19 @@ config MTD_UBI_GLUEBI
@@ -65,8 +63,6 @@ index 36663af..783fb18 100644
 +	   If in doubt, say "N".
 +
  endif # MTD_UBI
-diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile
-index b46b0c97..4e3c3d7 100644
 --- a/drivers/mtd/ubi/Makefile
 +++ b/drivers/mtd/ubi/Makefile
 @@ -3,5 +3,6 @@ obj-$(CONFIG_MTD_UBI) += ubi.o
@@ -76,9 +72,6 @@ index b46b0c97..4e3c3d7 100644
 +ubi-$(CONFIG_MTD_UBI_BLOCK) += block.o
  
  obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-new file mode 100644
-index 0000000..cea7d1c
 --- /dev/null
 +++ b/drivers/mtd/ubi/block.c
 @@ -0,0 +1,646 @@
@@ -728,11 +721,9 @@ index 0000000..cea7d1c
 +	ubiblock_detach_all();
 +	unregister_blkdev(ubiblock_major, "ubiblock");
 +}
-diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
-index 57deae9..6e30a3c 100644
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1298,6 +1298,15 @@ static int __init ubi_init(void)
+@@ -1290,6 +1290,15 @@ static int __init ubi_init(void)
  		}
  	}
  
@@ -748,7 +739,7 @@ index 57deae9..6e30a3c 100644
  	return 0;
  
  out_detach:
-@@ -1326,6 +1335,8 @@ static void __exit ubi_exit(void)
+@@ -1318,6 +1327,8 @@ static void __exit ubi_exit(void)
  {
  	int i;
  
@@ -757,11 +748,9 @@ index 57deae9..6e30a3c 100644
  	for (i = 0; i < UBI_MAX_DEVICES; i++)
  		if (ubi_devices[i]) {
  			mutex_lock(&ubi_devices_mutex);
-diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
-index 8ca49f2..39d3774 100644
 --- a/drivers/mtd/ubi/cdev.c
 +++ b/drivers/mtd/ubi/cdev.c
-@@ -561,6 +561,26 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
+@@ -585,6 +585,26 @@ static long vol_cdev_ioctl(struct file *
  		break;
  	}
  
@@ -788,11 +777,9 @@ index 8ca49f2..39d3774 100644
  	default:
  		err = -ENOTTY;
  		break;
-diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
-index 8ea6297..e76ff98 100644
 --- a/drivers/mtd/ubi/ubi.h
 +++ b/drivers/mtd/ubi/ubi.h
-@@ -864,6 +864,20 @@ int ubi_update_fastmap(struct ubi_device *ubi);
+@@ -864,6 +864,20 @@ int ubi_update_fastmap(struct ubi_device
  int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
  		     int fm_anchor);
  
@@ -813,8 +800,6 @@ index 8ea6297..e76ff98 100644
  /*
   * ubi_rb_for_each_entry - walk an RB-tree.
   * @rb: a pointer to type 'struct rb_node' to use as a loop counter
-diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
-index 723c324..b98585a 100644
 --- a/include/uapi/mtd/ubi-user.h
 +++ b/include/uapi/mtd/ubi-user.h
 @@ -134,6 +134,13 @@
@@ -831,7 +816,7 @@ index 723c324..b98585a 100644
   */
  
  /*
-@@ -191,6 +198,10 @@
+@@ -188,6 +195,10 @@
  /* Set an UBI volume property */
  #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
  			       struct ubi_set_vol_prop_req)
@@ -842,6 +827,3 @@ index 723c324..b98585a 100644
  
  /* Maximum MTD device name length supported by UBI */
  #define MAX_UBI_MTD_NAME_LEN 127
--- 
-1.9.2
-

target/linux/generic/patches-3.10/041-UBI-block-do-not-use-term-attach.patch

@@ -14,8 +14,6 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  drivers/mtd/ubi/ubi.h   | 14 ++++++++++----
  3 files changed, 32 insertions(+), 25 deletions(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index cea7d1c..6402e41 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
 @@ -29,10 +29,10 @@
@@ -33,7 +31,7 @@ index cea7d1c..6402e41 100644
   */
  
  #include <linux/module.h>
-@@ -374,7 +374,7 @@ static const struct block_device_operations ubiblock_ops = {
+@@ -374,7 +374,7 @@ static const struct block_device_operati
  	.getgeo	= ubiblock_getgeo,
  };
  
@@ -42,7 +40,7 @@ index cea7d1c..6402e41 100644
  {
  	struct ubiblock *dev;
  	struct gendisk *gd;
-@@ -464,7 +464,7 @@ static void ubiblock_cleanup(struct ubiblock *dev)
+@@ -464,7 +464,7 @@ static void ubiblock_cleanup(struct ubib
  	put_disk(dev->gd);
  }
  
@@ -51,7 +49,7 @@ index cea7d1c..6402e41 100644
  {
  	struct ubiblock *dev;
  
-@@ -503,7 +503,8 @@ static void ubiblock_resize(struct ubi_volume_info *vi)
+@@ -503,7 +503,8 @@ static void ubiblock_resize(struct ubi_v
  
  	/*
  	 * Need to lock the device list until we stop using the device,
@@ -61,7 +59,7 @@ index cea7d1c..6402e41 100644
  	 */
  	mutex_lock(&devices_mutex);
  	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
-@@ -528,12 +529,12 @@ static int ubiblock_notify(struct notifier_block *nb,
+@@ -528,12 +529,12 @@ static int ubiblock_notify(struct notifi
  	switch (notification_type) {
  	case UBI_VOLUME_ADDED:
  		/*
@@ -76,7 +74,7 @@ index cea7d1c..6402e41 100644
  		break;
  	case UBI_VOLUME_RESIZED:
  		ubiblock_resize(&nt->vi);
-@@ -561,7 +562,7 @@ open_volume_desc(const char *name, int ubi_num, int vol_id)
+@@ -561,7 +562,7 @@ open_volume_desc(const char *name, int u
  		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
  }
  
@@ -85,7 +83,7 @@ index cea7d1c..6402e41 100644
  {
  	int i, ret;
  	struct ubiblock_param *p;
-@@ -582,7 +583,7 @@ static int __init ubiblock_attach_from_param(void)
+@@ -582,7 +583,7 @@ static int __init ubiblock_attach_from_p
  		ubi_get_volume_info(desc, &vi);
  		ubi_close_volume(desc);
  
@@ -94,7 +92,7 @@ index cea7d1c..6402e41 100644
  		if (ret) {
  			ubi_err("block: can't add '%s' volume, err=%d\n",
  				vi.name, ret);
-@@ -592,7 +593,7 @@ static int __init ubiblock_attach_from_param(void)
+@@ -592,7 +593,7 @@ static int __init ubiblock_attach_from_p
  	return ret;
  }
  
@@ -139,11 +137,9 @@ index cea7d1c..6402e41 100644
 +	ubiblock_remove_all();
  	unregister_blkdev(ubiblock_major, "ubiblock");
  }
-diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
-index 39d3774..11c8473 100644
 --- a/drivers/mtd/ubi/cdev.c
 +++ b/drivers/mtd/ubi/cdev.c
-@@ -567,7 +567,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
+@@ -591,7 +591,7 @@ static long vol_cdev_ioctl(struct file *
  		struct ubi_volume_info vi;
  
  		ubi_get_volume_info(desc, &vi);
@@ -152,7 +148,7 @@ index 39d3774..11c8473 100644
  		break;
  	}
  
-@@ -577,7 +577,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
+@@ -601,7 +601,7 @@ static long vol_cdev_ioctl(struct file *
  		struct ubi_volume_info vi;
  
  		ubi_get_volume_info(desc, &vi);
@@ -161,11 +157,9 @@ index 39d3774..11c8473 100644
  		break;
  	}
  
-diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
-index e76ff98..2e588a9 100644
 --- a/drivers/mtd/ubi/ubi.h
 +++ b/drivers/mtd/ubi/ubi.h
-@@ -868,13 +868,19 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
+@@ -868,13 +868,19 @@ int ubi_scan_fastmap(struct ubi_device *
  #ifdef CONFIG_MTD_UBI_BLOCK
  int ubiblock_init(void);
  void ubiblock_exit(void);
@@ -189,6 +183,3 @@ index e76ff98..2e588a9 100644
  #endif
  
  
--- 
-1.9.2
-

target/linux/generic/patches-3.10/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch

@@ -24,11 +24,9 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  drivers/mtd/ubi/block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 6402e41..cd6be98 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(const char *val,
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
  	return 0;
  }
  
@@ -37,6 +35,3 @@ index 6402e41..cd6be98 100644
  	.set    = ubiblock_set_param,
  };
  module_param_cb(block, &ubiblock_param_ops, NULL, 0);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch

@@ -15,11 +15,9 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  drivers/mtd/ubi/block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index cd6be98..16e6731 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -201,7 +201,7 @@ static int ubiblock_read(struct ubiblock *dev, char *buffer,
+@@ -201,7 +201,7 @@ static int ubiblock_read(struct ubiblock
  	int ret, leb, offset;
  	int bytes_left = len;
  	int to_read = len;
@@ -28,6 +26,3 @@ index cd6be98..16e6731 100644
  
  	/* Get LEB:offset address to read from */
  	offset = do_div(pos, dev->leb_size);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/044-UBI-rename-block-device-ioctls.patch

@@ -16,8 +16,6 @@ Acked-by: Ezequiel Garcia <[email protected]>
  include/uapi/mtd/ubi-user.h | 14 +++++++-------
  3 files changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 16e6731..69a74fd 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
 @@ -32,7 +32,7 @@
@@ -29,11 +27,9 @@ index 16e6731..69a74fd 100644
   */
  
  #include <linux/module.h>
-diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
-index 11c8473..f54562a 100644
 --- a/drivers/mtd/ubi/cdev.c
 +++ b/drivers/mtd/ubi/cdev.c
-@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
+@@ -585,8 +585,8 @@ static long vol_cdev_ioctl(struct file *
  		break;
  	}
  
@@ -44,7 +40,7 @@ index 11c8473..f54562a 100644
  	{
  		struct ubi_volume_info vi;
  
-@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
+@@ -595,8 +595,8 @@ static long vol_cdev_ioctl(struct file *
  		break;
  	}
  
@@ -55,8 +51,6 @@ index 11c8473..f54562a 100644
  	{
  		struct ubi_volume_info vi;
  
-diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
-index b98585a..9c885e2 100644
 --- a/include/uapi/mtd/ubi-user.h
 +++ b/include/uapi/mtd/ubi-user.h
 @@ -138,9 +138,9 @@
@@ -72,7 +66,7 @@ index b98585a..9c885e2 100644
   */
  
  /*
-@@ -198,10 +198,10 @@
+@@ -195,10 +195,10 @@
  /* Set an UBI volume property */
  #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
  			       struct ubi_set_vol_prop_req)
@@ -87,6 +81,3 @@ index b98585a..9c885e2 100644
  
  /* Maximum MTD device name length supported by UBI */
  #define MAX_UBI_MTD_NAME_LEN 127
--- 
-1.9.2
-

target/linux/generic/patches-3.10/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch

@@ -17,11 +17,9 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  drivers/mtd/ubi/block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 69a74fd..7ff473c 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(const char *val,
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
  	return 0;
  }
  
@@ -30,6 +28,3 @@ index 69a74fd..7ff473c 100644
  	.set    = ubiblock_set_param,
  };
  module_param_cb(block, &ubiblock_param_ops, NULL, 0);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/046-UBI-avoid-workqueue-format-string-leak.patch

@@ -12,11 +12,9 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  drivers/mtd/ubi/block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 7ff473c..8d659e6 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -431,7 +431,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
+@@ -431,7 +431,7 @@ int ubiblock_create(struct ubi_volume_in
  	 * Create one workqueue per volume (per registered block device).
  	 * Rembember workqueues are cheap, they're not threads.
  	 */
@@ -25,6 +23,3 @@ index 7ff473c..8d659e6 100644
  	if (!dev->wq)
  		goto out_free_queue;
  	INIT_WORK(&dev->work, ubiblock_do_work);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch

@@ -16,8 +16,6 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
  include/uapi/mtd/ubi-user.h | 19 +++++++++++++++----
  1 file changed, 15 insertions(+), 4 deletions(-)
 
-diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
-index 9c885e2..1927b0d 100644
 --- a/include/uapi/mtd/ubi-user.h
 +++ b/include/uapi/mtd/ubi-user.h
 @@ -138,9 +138,12 @@
@@ -36,7 +34,7 @@ index 9c885e2..1927b0d 100644
   */
  
  /*
-@@ -199,7 +202,7 @@
+@@ -196,7 +199,7 @@
  #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
  			       struct ubi_set_vol_prop_req)
  /* Create a R/O block device on top of an UBI volume */
@@ -45,7 +43,7 @@ index 9c885e2..1927b0d 100644
  /* Remove the R/O block device */
  #define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
  
-@@ -431,4 +434,12 @@ struct ubi_set_vol_prop_req {
+@@ -428,4 +431,12 @@ struct ubi_set_vol_prop_req {
  	__u64 value;
  }  __packed;
  
@@ -58,6 +56,3 @@ index 9c885e2..1927b0d 100644
 +}  __packed;
 +
  #endif /* __UBI_USER_H__ */
--- 
-1.9.2
-

target/linux/generic/patches-3.10/060-hso_devices.patch

@@ -15,7 +15,7 @@
  	{USB_DEVICE(0x0af0, 0xd155)},
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -1266,6 +1266,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1280,6 +1280,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
  		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
  		0 ),
  

target/linux/generic/patches-3.10/100-overlayfs.patch

@@ -322,7 +322,7 @@
  extern const struct file_operations pipefifo_fops;
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -402,6 +402,7 @@ int __inode_permission(struct inode *ino
+@@ -403,6 +403,7 @@ int __inode_permission(struct inode *ino
  
  	return security_inode_permission(inode, mask);
  }
@@ -330,7 +330,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -2868,9 +2869,12 @@ finish_open_created:
+@@ -2869,9 +2870,12 @@ finish_open_created:
  	error = may_open(&nd->path, acc_mode, open_flag);
  	if (error)
  		goto out;
@@ -384,7 +384,7 @@
  {
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -800,8 +800,7 @@ struct file *dentry_open(const struct pa
+@@ -788,8 +788,7 @@ struct file *dentry_open(const struct pa
  	f = get_empty_filp();
  	if (!IS_ERR(f)) {
  		f->f_flags = flags;
@@ -394,7 +394,7 @@
  		if (!error) {
  			/* from now on we need fput() to dispose of f */
  			error = open_check_o_direct(f);
-@@ -818,6 +817,26 @@ struct file *dentry_open(const struct pa
+@@ -806,6 +805,26 @@ struct file *dentry_open(const struct pa
  }
  EXPORT_SYMBOL(dentry_open);
  

target/linux/generic/patches-3.10/204-module_strip.patch

@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1776,6 +1776,13 @@ config MODULE_SIG_HASH
+@@ -1783,6 +1783,13 @@ config MODULE_SIG_HASH
  	default "sha384" if MODULE_SIG_SHA384
  	default "sha512" if MODULE_SIG_SHA512
  
@@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	set_license(mod, get_modinfo(info, "license"));
 --- a/scripts/mod/modpost.c
 +++ b/scripts/mod/modpost.c
-@@ -1740,7 +1740,9 @@ static void read_symbols(char *modname)
+@@ -1744,7 +1744,9 @@ static void read_symbols(char *modname)
  		symname = info.strtab + sym->st_name;
  
  		handle_modversions(mod, &info, sym, symname);
@@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	}
  	if (!is_vmlinux(modname) ||
  	     (is_vmlinux(modname) && vmlinux_section_warnings))
-@@ -1884,7 +1886,9 @@ static void add_header(struct buffer *b,
+@@ -1888,7 +1890,9 @@ static void add_header(struct buffer *b,
  	buf_printf(b, "#include <linux/vermagic.h>\n");
  	buf_printf(b, "#include <linux/compiler.h>\n");
  	buf_printf(b, "\n");
@@ -153,7 +153,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	buf_printf(b, "\n");
  	buf_printf(b, "struct module __this_module\n");
  	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -1901,16 +1905,20 @@ static void add_header(struct buffer *b,
+@@ -1905,16 +1909,20 @@ static void add_header(struct buffer *b,
  
  static void add_intree_flag(struct buffer *b, int is_intree)
  {
@@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  }
  
  /**
-@@ -2003,11 +2011,13 @@ static void add_depends(struct buffer *b
+@@ -2007,11 +2015,13 @@ static void add_depends(struct buffer *b
  
  static void add_srcversion(struct buffer *b, struct module *mod)
  {
@@ -188,7 +188,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  }
  
  static void write_if_changed(struct buffer *b, const char *fname)
-@@ -2233,7 +2243,9 @@ int main(int argc, char **argv)
+@@ -2237,7 +2247,9 @@ int main(int argc, char **argv)
  		add_staging_flag(&buf, mod->name);
  		err |= add_versions(&buf, mod);
  		add_depends(&buf, mod, modules);

target/linux/generic/patches-3.10/320-ppc4xx_optimization.patch

@@ -3,7 +3,7 @@ they still want to support gcc 3.3 -- well, we don't.
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -137,7 +137,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+@@ -139,7 +139,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
  KBUILD_CFLAGS		+= -mno-sched-epilog
  endif
  

target/linux/generic/patches-3.10/321-powerpc_crtsavres_prereq.patch

@@ -1,6 +1,6 @@
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -104,7 +104,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+@@ -106,7 +106,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
  
  CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
  

target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <[email protected]>
  drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
 
-diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
-index 6e30a3c..999a36b 100644
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd_device(const char *mtd_dev)
+@@ -1207,6 +1207,36 @@ static struct mtd_info * __init open_mtd
  	return mtd;
  }
  
@@ -50,7 +48,7 @@ index 6e30a3c..999a36b 100644
  static int __init ubi_init(void)
  {
  	int err, i, k;
-@@ -1298,6 +1328,12 @@ static int __init ubi_init(void)
+@@ -1290,6 +1320,12 @@ static int __init ubi_init(void)
  		}
  	}
  
@@ -63,6 +61,3 @@ index 6e30a3c..999a36b 100644
  	err = ubiblock_init();
  	if (err) {
  		ubi_err("block: cannot initialize, error %d", err);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch

@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <[email protected]>
  drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 8d659e6..2dbe2f4 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_param(void)
+@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_p
  	return ret;
  }
  
@@ -69,6 +67,3 @@ index 8d659e6..2dbe2f4 100644
  	/*
  	 * Block devices are only created upon user requests, so we ignore
  	 * existing volumes.
--- 
-1.9.2
-

target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <[email protected]>
  init/do_mounts.c | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..faba9c6 100644
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -432,7 +432,27 @@ retry:
+@@ -428,7 +428,27 @@ retry:
  out:
  	put_page(page);
  }
@@ -42,7 +40,7 @@ index 82f2288..faba9c6 100644
  #ifdef CONFIG_ROOT_NFS
  
  #define NFSROOT_TIMEOUT_MIN	5
-@@ -526,6 +546,10 @@ void __init mount_root(void)
+@@ -522,6 +542,10 @@ void __init mount_root(void)
  			change_floppy("root floppy");
  	}
  #endif
@@ -53,6 +51,3 @@ index 82f2288..faba9c6 100644
  #ifdef CONFIG_BLOCK
  	create_dev("/dev/root", ROOT_DEV);
  	mount_block_root("/dev/root", root_mountflags);
--- 
-1.9.2
-

target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch

@@ -9,8 +9,6 @@ Signed-off-by: Daniel Golle <[email protected]>
  drivers/mtd/ubi/block.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 2dbe2f4..eaa29f8 100644
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
 @@ -48,6 +48,7 @@
@@ -21,7 +19,7 @@ index 2dbe2f4..eaa29f8 100644
  
  #include "ubi-media.h"
  #include "ubi.h"
-@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_info *vi)
+@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_in
  	add_disk(dev->gd);
  	ubi_msg("%s created from ubi%d:%d(%s)",
  		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
@@ -37,6 +35,3 @@ index 2dbe2f4..eaa29f8 100644
  	return 0;
  
  out_free_queue:
--- 
-1.9.2
-

target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch

@@ -22,11 +22,9 @@ Signed-off-by: Artem Bityutskiy <[email protected]>
 
 ---
 
-diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
-index e18b988..2290d58 100644
 --- a/fs/ubifs/io.c
 +++ b/fs/ubifs/io.c
-@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len,
+@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_i
  		return err;
  
  	if (type != ch->node_type) {
@@ -67,11 +65,9 @@ index e18b988..2290d58 100644
  	return -EINVAL;
  }
  
-diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
-index a81c7b5..3904c85 100644
 --- a/fs/ubifs/super.c
 +++ b/fs/ubifs/super.c
-@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info *c)
+@@ -1164,6 +1164,9 @@ static int mount_ubifs(struct ubifs_info
  	size_t sz;
  
  	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
@@ -81,7 +77,7 @@ index a81c7b5..3904c85 100644
  	err = init_constants_early(c);
  	if (err)
  		return err;
-@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info *c)
+@@ -1229,6 +1232,8 @@ static int mount_ubifs(struct ubifs_info
  	if (err)
  		goto out_free;
  
@@ -90,8 +86,6 @@ index a81c7b5..3904c85 100644
  	/*
  	 * Make sure the compressor which is set as default in the superblock
  	 * or overridden by mount options is actually compiled in.
-diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
-index e8c8cfe..c1f71fe 100644
 --- a/fs/ubifs/ubifs.h
 +++ b/fs/ubifs/ubifs.h
 @@ -51,6 +51,15 @@

target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch

@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -1319,7 +1319,7 @@ out:
+@@ -1322,7 +1322,7 @@ out:
  	return ret;
  }
  
@@ -41,7 +41,7 @@
  		       const struct in6_addr *daddr, unsigned int prefs,
  		       struct in6_addr *saddr)
  {
-@@ -1444,7 +1444,6 @@ try_nextdev:
+@@ -1447,7 +1447,6 @@ try_nextdev:
  	in6_ifa_put(hiscore->ifa);
  	return 0;
  }
@@ -49,7 +49,7 @@
  
  int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
  		      unsigned char banned_flags)
-@@ -5170,6 +5169,9 @@ int __init addrconf_init(void)
+@@ -5173,6 +5172,9 @@ int __init addrconf_init(void)
  
  	ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
  	return 0;
  errout:
  	rtnl_af_unregister(&inet6_ops);
-@@ -5188,6 +5190,9 @@ void addrconf_cleanup(void)
+@@ -5191,6 +5193,9 @@ void addrconf_cleanup(void)
  	struct net_device *dev;
  	int i;
  

target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch

@@ -139,7 +139,7 @@
  
 --- a/net/bridge/netfilter/ebtables.c
 +++ b/net/bridge/netfilter/ebtables.c
-@@ -2407,11 +2407,13 @@ static int __init ebtables_init(void)
+@@ -2406,11 +2406,13 @@ static int __init ebtables_init(void)
  	}
  
  	printk(KERN_INFO "Ebtables v2.0 registered\n");

target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch

@@ -14,8 +14,6 @@ Signed-off-by: Steven Barth <[email protected]>
  net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
  3 files changed, 291 insertions(+), 11 deletions(-)
 
-diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
-index a5593da..414f5a1 100644
 --- a/include/net/ip6_tunnel.h
 +++ b/include/net/ip6_tunnel.h
 @@ -15,6 +15,18 @@
@@ -45,8 +43,6 @@ index a5593da..414f5a1 100644
  
  	__be16			i_flags;
  	__be16			o_flags;
-diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
-index aee73d0..c5b25d4 100644
 --- a/include/uapi/linux/if_tunnel.h
 +++ b/include/uapi/linux/if_tunnel.h
 @@ -53,10 +53,23 @@ enum {
@@ -73,8 +69,6 @@ index aee73d0..c5b25d4 100644
  /* SIT-mode i_flags */
  #define	SIT_ISATAP	0x0001
  
-diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index b05b609..c2216b0 100644
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
 @@ -16,6 +16,8 @@
@@ -86,7 +80,7 @@ index b05b609..c2216b0 100644
   */
  
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-@@ -76,11 +78,9 @@ static bool log_ecn_error = true;
+@@ -79,11 +81,9 @@ static bool log_ecn_error = true;
  module_param(log_ecn_error, bool, 0644);
  MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
  
@@ -100,7 +94,7 @@ index b05b609..c2216b0 100644
  }
  
  static int ip6_tnl_dev_init(struct net_device *dev);
-@@ -179,15 +179,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
+@@ -172,15 +172,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
  static struct ip6_tnl *
  ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
  {
@@ -129,7 +123,7 @@ index b05b609..c2216b0 100644
  	}
  	t = rcu_dereference(ip6n->tnls_wc[0]);
  	if (t && (t->dev->flags & IFF_UP))
-@@ -217,7 +226,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, const struct __ip6_tnl_parm *p)
+@@ -210,7 +219,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
  
  	if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
  		prio = 1;
@@ -138,8 +132,8 @@ index b05b609..c2216b0 100644
  	}
  	return &ip6n->tnls[prio][h];
  }
-@@ -385,6 +394,12 @@ ip6_tnl_dev_uninit(struct net_device *dev)
- 	struct net *net = t->net;
+@@ -377,6 +386,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+ 	struct net *net = dev_net(dev);
  	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
  
 +	while (t->parms.fmrs) {
@@ -151,7 +145,7 @@ index b05b609..c2216b0 100644
  	if (dev == ip6n->fb_tnl_dev)
  		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
  	else
-@@ -768,6 +783,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+@@ -760,6 +775,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
  }
  EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
  
@@ -260,9 +254,9 @@ index b05b609..c2216b0 100644
  /**
   * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
   *   @skb: received socket buffer
-@@ -812,6 +928,26 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
- 		skb_reset_network_header(skb);
+@@ -806,6 +923,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
  		skb->protocol = htons(protocol);
+ 		skb->pkt_type = PACKET_HOST;
  		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
 +		if (protocol == ETH_P_IP &&
 +			!ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
@@ -285,9 +279,9 @@ index b05b609..c2216b0 100644
 +				}
 +		}
  
- 		__skb_tunnel_rx(skb, t->dev, t->net);
+ 		__skb_tunnel_rx(skb, t->dev);
  
-@@ -1072,6 +1208,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+@@ -1057,6 +1194,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
  	__u8 dsfield;
  	__u32 mtu;
  	int err;
@@ -295,7 +289,7 @@ index b05b609..c2216b0 100644
  
  	if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
  	    !ip6_tnl_xmit_ctl(t))
-@@ -1091,6 +1228,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+@@ -1076,6 +1214,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
  	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
  		fl6.flowi6_mark = skb->mark;
  
@@ -314,7 +308,7 @@ index b05b609..c2216b0 100644
  	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
  	if (err != 0) {
  		/* XXX: send ICMP error even if DF is not set. */
-@@ -1259,6 +1408,14 @@ ip6_tnl_change(struct ip6_tnl *t, const struct __ip6_tnl_parm *p)
+@@ -1244,6 +1394,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
  	t->parms.flowinfo = p->flowinfo;
  	t->parms.link = p->link;
  	t->parms.proto = p->proto;
@@ -329,7 +323,7 @@ index b05b609..c2216b0 100644
  	ip6_tnl_dst_reset(t);
  	ip6_tnl_link_config(t);
  	return 0;
-@@ -1289,6 +1446,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_parm *p, const struct ip6_tnl_parm *u)
+@@ -1274,6 +1432,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
  	p->flowinfo = u->flowinfo;
  	p->link = u->link;
  	p->proto = u->proto;
@@ -337,7 +331,7 @@ index b05b609..c2216b0 100644
  	memcpy(p->name, u->name, sizeof(u->name));
  }
  
-@@ -1569,6 +1727,15 @@ static int ip6_tnl_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -1543,6 +1702,15 @@ static int ip6_tnl_validate(struct nlatt
  	return 0;
  }
  
@@ -353,7 +347,7 @@ index b05b609..c2216b0 100644
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
  				  struct __ip6_tnl_parm *parms)
  {
-@@ -1602,6 +1769,46 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[],
+@@ -1576,6 +1744,46 @@ static void ip6_tnl_netlink_parms(struct
  
  	if (data[IFLA_IPTUN_PROTO])
  		parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
@@ -400,7 +394,7 @@ index b05b609..c2216b0 100644
  }
  
  static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
-@@ -1654,6 +1861,12 @@ static void ip6_tnl_dellink(struct net_device *dev, struct list_head *head)
+@@ -1628,6 +1836,12 @@ static void ip6_tnl_dellink(struct net_d
  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
@@ -413,7 +407,7 @@ index b05b609..c2216b0 100644
  	return
  		/* IFLA_IPTUN_LINK */
  		nla_total_size(4) +
-@@ -1671,6 +1884,24 @@ static size_t ip6_tnl_get_size(const struct net_device *dev)
+@@ -1645,6 +1859,24 @@ static size_t ip6_tnl_get_size(const str
  		nla_total_size(4) +
  		/* IFLA_IPTUN_PROTO */
  		nla_total_size(1) +
@@ -438,7 +432,7 @@ index b05b609..c2216b0 100644
  		0;
  }
  
-@@ -1678,6 +1909,9 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev)
+@@ -1652,6 +1884,9 @@ static int ip6_tnl_fill_info(struct sk_b
  {
  	struct ip6_tnl *tunnel = netdev_priv(dev);
  	struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -448,7 +442,7 @@ index b05b609..c2216b0 100644
  
  	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
  	    nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
-@@ -1688,8 +1922,27 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev)
+@@ -1662,8 +1897,27 @@ static int ip6_tnl_fill_info(struct sk_b
  	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
  	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
  	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
@@ -477,7 +471,7 @@ index b05b609..c2216b0 100644
  	return 0;
  
  nla_put_failure:
-@@ -1705,6 +1958,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
+@@ -1679,6 +1933,7 @@ static const struct nla_policy ip6_tnl_p
  	[IFLA_IPTUN_FLOWINFO]		= { .type = NLA_U32 },
  	[IFLA_IPTUN_FLAGS]		= { .type = NLA_U32 },
  	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
@@ -485,6 +479,3 @@ index b05b609..c2216b0 100644
  };
  
  static struct rtnl_link_ops ip6_link_ops __read_mostly = {
--- 
-1.9.1
-

target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

@@ -127,7 +127,7 @@
  static const struct rt6_info ip6_blk_hole_entry_template = {
  	.dst = {
  		.__refcnt	= ATOMIC_INIT(1),
-@@ -1509,6 +1527,11 @@ int ip6_route_add(struct fib6_config *cf
+@@ -1510,6 +1528,11 @@ int ip6_route_add(struct fib6_config *cf
  			rt->dst.output = ip6_pkt_prohibit_out;
  			rt->dst.input = ip6_pkt_prohibit;
  			break;
@@ -139,7 +139,7 @@
  		case RTN_THROW:
  		default:
  			rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
-@@ -2088,6 +2111,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2089,6 +2112,17 @@ static int ip6_pkt_prohibit_out(struct s
  	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -157,7 +157,7 @@
  /*
   *	Allocate a dst for local (unicast / anycast) address.
   */
-@@ -2290,7 +2324,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2291,7 +2325,8 @@ static int rtm_to_fib6_config(struct sk_
  	if (rtm->rtm_type == RTN_UNREACHABLE ||
  	    rtm->rtm_type == RTN_BLACKHOLE ||
  	    rtm->rtm_type == RTN_PROHIBIT ||
@@ -167,7 +167,7 @@
  		cfg->fc_flags |= RTF_REJECT;
  
  	if (rtm->rtm_type == RTN_LOCAL)
-@@ -2492,6 +2527,9 @@ static int rt6_fill_node(struct net *net
+@@ -2493,6 +2528,9 @@ static int rt6_fill_node(struct net *net
  		case -EACCES:
  			rtm->rtm_type = RTN_PROHIBIT;
  			break;
@@ -177,7 +177,7 @@
  		case -EAGAIN:
  			rtm->rtm_type = RTN_THROW;
  			break;
-@@ -2742,6 +2780,8 @@ static int ip6_route_dev_notify(struct n
+@@ -2743,6 +2781,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -186,7 +186,7 @@
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3002,6 +3042,17 @@ static int __net_init ip6_route_net_init
+@@ -3003,6 +3043,17 @@ static int __net_init ip6_route_net_init
  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
  			 ip6_template_metrics, true);
@@ -204,7 +204,7 @@
  #endif
  
  	net->ipv6.sysctl.flush_delay = 0;
-@@ -3020,6 +3071,8 @@ out:
+@@ -3021,6 +3072,8 @@ out:
  	return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -213,7 +213,7 @@
  out_ip6_prohibit_entry:
  	kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -3037,6 +3090,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3038,6 +3091,7 @@ static void __net_exit ip6_route_net_exi
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	kfree(net->ipv6.ip6_prohibit_entry);
  	kfree(net->ipv6.ip6_blk_hole_entry);
@@ -221,7 +221,7 @@
  #endif
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }
-@@ -3133,6 +3187,9 @@ int __init ip6_route_init(void)
+@@ -3134,6 +3188,9 @@ int __init ip6_route_init(void)
  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

target/linux/generic/patches-3.10/831-ledtrig_netdev.patch

@@ -29,7 +29,7 @@
  #include <linux/netdevice.h>
  #include <linux/timer.h>
  #include <linux/ctype.h>
-@@ -307,8 +306,9 @@ done:
+@@ -294,8 +293,9 @@ done:
  static void netdev_trig_timer(unsigned long arg)
  {
  	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
@@ -40,7 +40,7 @@
  
  	write_lock(&trigger_data->lock);
  
-@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
  		goto no_restart;
  	}
  

target/linux/generic/patches-3.10/902-debloat_proc.patch

@@ -1,6 +1,6 @@
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2267,6 +2267,8 @@ static const struct file_operations proc
+@@ -2266,6 +2266,8 @@ static const struct file_operations proc
  
  static int __init proc_locks_init(void)
  {
@@ -173,7 +173,7 @@
  		goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper
+@@ -2842,6 +2842,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {

target/linux/generic/patches-3.10/903-debloat_direct_io.patch

@@ -68,7 +68,7 @@
  
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -652,9 +652,12 @@ int open_check_o_direct(struct file *f)
+@@ -641,9 +641,12 @@ int open_check_o_direct(struct file *f)
  {
  	/* NB: we're sure to have correct a_ops only after f_op->open */
  	if (f->f_flags & O_DIRECT) {