kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old diffutils version on osx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45506
This commit is contained in:
		@@ -76,10 +76,11 @@
 | 
			
		||||
 
 | 
			
		||||
 	counters = alloc_counters(table);
 | 
			
		||||
 	if (IS_ERR(counters))
 | 
			
		||||
@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
 | 
			
		||||
@@ -965,6 +994,14 @@ copy_entries_to_user(unsigned int total_
 | 
			
		||||
 			ret = -EFAULT;
 | 
			
		||||
 			goto free_counters;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
+
 | 
			
		||||
+		flags = e->ip.flags & IPT_F_MASK;
 | 
			
		||||
+		if (copy_to_user(userptr + off
 | 
			
		||||
+				 + offsetof(struct ipt_entry, ip.flags),
 | 
			
		||||
@@ -87,7 +88,6 @@
 | 
			
		||||
+			ret = -EFAULT;
 | 
			
		||||
+			goto free_counters;
 | 
			
		||||
+		}
 | 
			
		||||
+
 | 
			
		||||
 
 | 
			
		||||
 		for (i = sizeof(struct ipt_entry);
 | 
			
		||||
 		     i < e->target_offset;
 | 
			
		||||
 		     i += m->u.match_size) {
 | 
			
		||||
 
 | 
			
		||||
@@ -50,10 +50,7 @@
 | 
			
		||||
+config USB_DWC2_PERIPHERAL
 | 
			
		||||
+	bool "Gadget only mode"
 | 
			
		||||
+	depends on USB_GADGET=y || USB_GADGET=USB_DWC2
 | 
			
		||||
 	help
 | 
			
		||||
-	  The Designware USB2.0 platform interface module for
 | 
			
		||||
-	  controllers directly connected to the CPU. This is only
 | 
			
		||||
-	  used for host mode.
 | 
			
		||||
+	help
 | 
			
		||||
+	  The Designware USB2.0 high-speed gadget controller
 | 
			
		||||
+	  integrated into many SoCs. Select this option if you want the
 | 
			
		||||
+	  driver to operate in Peripheral-only mode. This option requires
 | 
			
		||||
@@ -62,7 +59,10 @@
 | 
			
		||||
+config USB_DWC2_DUAL_ROLE
 | 
			
		||||
+	bool "Dual Role mode"
 | 
			
		||||
+	depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2)
 | 
			
		||||
+	help
 | 
			
		||||
 	help
 | 
			
		||||
-	  The Designware USB2.0 platform interface module for
 | 
			
		||||
-	  controllers directly connected to the CPU. This is only
 | 
			
		||||
-	  used for host mode.
 | 
			
		||||
+	  Select this option if you want the driver to work in a dual-role
 | 
			
		||||
+	  mode. In this mode both host and gadget features are enabled, and
 | 
			
		||||
+	  the role will be determined by the cable that gets plugged-in. This
 | 
			
		||||
 
 | 
			
		||||
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 | 
			
		||||
 	 * file over a directory and vice versa, but if it's a directory,
 | 
			
		||||
 	 * the VFS can't check whether the victim is empty. The filesystem
 | 
			
		||||
@@ -828,9 +850,14 @@ static int jffs2_rename (struct inode *o
 | 
			
		||||
 	if (S_ISDIR(old_dentry->d_inode->i_mode) && !victim_f)
 | 
			
		||||
 	if (d_is_dir(old_dentry) && !victim_f)
 | 
			
		||||
 		inc_nlink(new_dir_i);
 | 
			
		||||
 
 | 
			
		||||
-	/* Unlink the original */
 | 
			
		||||
 
 | 
			
		||||
@@ -76,10 +76,11 @@
 | 
			
		||||
 
 | 
			
		||||
 	counters = alloc_counters(table);
 | 
			
		||||
 	if (IS_ERR(counters))
 | 
			
		||||
@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
 | 
			
		||||
@@ -965,6 +994,14 @@ copy_entries_to_user(unsigned int total_
 | 
			
		||||
 			ret = -EFAULT;
 | 
			
		||||
 			goto free_counters;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
+
 | 
			
		||||
+		flags = e->ip.flags & IPT_F_MASK;
 | 
			
		||||
+		if (copy_to_user(userptr + off
 | 
			
		||||
+				 + offsetof(struct ipt_entry, ip.flags),
 | 
			
		||||
@@ -87,7 +88,6 @@
 | 
			
		||||
+			ret = -EFAULT;
 | 
			
		||||
+			goto free_counters;
 | 
			
		||||
+		}
 | 
			
		||||
+
 | 
			
		||||
 
 | 
			
		||||
 		for (i = sizeof(struct ipt_entry);
 | 
			
		||||
 		     i < e->target_offset;
 | 
			
		||||
 		     i += m->u.match_size) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user