summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.8/100-overlayfs.patch4
-rw-r--r--target/linux/generic/patches-3.8/250-netfilter_depends.patch2
-rw-r--r--target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch2
-rw-r--r--target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch2
-rw-r--r--target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch4
-rw-r--r--target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch2
-rw-r--r--target/linux/generic/patches-3.8/840-rtc7301.patch2
-rw-r--r--target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch2
-rw-r--r--target/linux/generic/patches-3.8/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-3.8/902-debloat_proc.patch2
-rw-r--r--target/linux/generic/patches-3.8/950-vm_exports.patch2
11 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch
index 3e065137b8..e190ee5060 100644
--- a/target/linux/generic/patches-3.8/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.8/100-overlayfs.patch
@@ -3102,7 +3102,7 @@
+module_exit(ovl_exit);
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1305,6 +1305,7 @@ long do_splice_direct(struct file *in, l
+@@ -1307,6 +1307,7 @@ long do_splice_direct(struct file *in, l
return ret;
}
@@ -3175,7 +3175,7 @@
int flags, const char *name,
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5623,6 +5623,13 @@ F: drivers/scsi/osd/
+@@ -5661,6 +5661,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
diff --git a/target/linux/generic/patches-3.8/250-netfilter_depends.patch b/target/linux/generic/patches-3.8/250-netfilter_depends.patch
index 3c9013400a..218df4cfb1 100644
--- a/target/linux/generic/patches-3.8/250-netfilter_depends.patch
+++ b/target/linux/generic/patches-3.8/250-netfilter_depends.patch
@@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -750,7 +749,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -757,7 +756,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
diff --git a/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch b/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
index 3c23825b06..b3b8ddcfde 100644
--- a/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
@@ -13,7 +13,7 @@
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
-@@ -141,6 +141,12 @@ FEXPORT(__kernel_entry)
+@@ -140,6 +140,12 @@ FEXPORT(__kernel_entry)
j kernel_entry
#endif
diff --git a/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
index 02b0403833..08c012cdc7 100644
--- a/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
+++ b/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -1176,6 +1176,27 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1183,6 +1183,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
diff --git a/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch b/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
index 23a1b1b26d..e3f203289e 100644
--- a/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
+++ b/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -980,6 +980,27 @@ config NETFILTER_XT_MATCH_IPVS
+@@ -987,6 +987,27 @@ config NETFILTER_XT_MATCH_IPVS
If unsure, say N.
@@ -28,7 +28,7 @@
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED
-@@ -1176,26 +1197,11 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1183,26 +1204,11 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
diff --git a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
index f03ceb65b0..4d8161eb1d 100644
--- a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
@@ -87,7 +87,7 @@
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -531,15 +531,29 @@ static inline bool br_multicast_is_route
+@@ -537,15 +537,29 @@ static inline void br_mdb_uninit(void)
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER
diff --git a/target/linux/generic/patches-3.8/840-rtc7301.patch b/target/linux/generic/patches-3.8/840-rtc7301.patch
index 6c56dd714f..89b5d46fc9 100644
--- a/target/linux/generic/patches-3.8/840-rtc7301.patch
+++ b/target/linux/generic/patches-3.8/840-rtc7301.patch
@@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
-@@ -773,6 +773,15 @@ config RTC_DRV_NUC900
+@@ -781,6 +781,15 @@ config RTC_DRV_NUC900
If you say yes here you get support for the RTC subsystem of the
NUC910/NUC920 used in embedded systems.
diff --git a/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
index 3beeb1383f..564e506017 100644
--- a/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
+++ b/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
@@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
-@@ -428,6 +428,15 @@ config RTC_DRV_RV3029C2
+@@ -436,6 +436,15 @@ config RTC_DRV_RV3029C2
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
diff --git a/target/linux/generic/patches-3.8/863-gpiommc.patch b/target/linux/generic/patches-3.8/863-gpiommc.patch
index 7dfe2fa287..aa66000044 100644
--- a/target/linux/generic/patches-3.8/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.8/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3478,6 +3478,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -3500,6 +3500,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch
index e994c5b883..0ea0bebf53 100644
--- a/target/linux/generic/patches-3.8/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch
@@ -339,7 +339,7 @@
" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",
--- a/ipc/util.c
+++ b/ipc/util.c
-@@ -148,6 +148,9 @@ void __init ipc_init_proc_interface(cons
+@@ -149,6 +149,9 @@ void __init ipc_init_proc_interface(cons
struct proc_dir_entry *pde;
struct ipc_proc_iface *iface;
diff --git a/target/linux/generic/patches-3.8/950-vm_exports.patch b/target/linux/generic/patches-3.8/950-vm_exports.patch
index 1d8f954f6b..c1819b1b88 100644
--- a/target/linux/generic/patches-3.8/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.8/950-vm_exports.patch
@@ -62,7 +62,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -1403,6 +1403,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1408,6 +1408,7 @@ void zap_page_range(struct vm_area_struc
mmu_notifier_invalidate_range_end(mm, start, end);
tlb_finish_mmu(&tlb, start, end);
}