projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e1b870
)
refresh patches to -rc3
author
Imre Kaloz
<kaloz@openwrt.org>
Sat, 11 Feb 2012 17:43:06 +0000
(17:43 +0000)
committer
Imre Kaloz
<kaloz@openwrt.org>
Sat, 11 Feb 2012 17:43:06 +0000
(17:43 +0000)
SVN-Revision: 30456
target/linux/generic/patches-3.3/100-overlayfs_v12.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/400-rootfs_split.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/863-gpiommc.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/950-vm_exports.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
index b7508e6639621e208600dd3566ef62db6cbc8e24..5eda87c8d643de3aed88149521bfc97f8cb85da6 100644
(file)
--- a/
target/linux/generic/patches-3.3/100-overlayfs_v12.patch
+++ b/
target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@
-244,7
+244,7
@@
========================
--- a/MAINTAINERS
+++ b/MAINTAINERS
========================
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -49
30,6 +4930
,13 @@ F: drivers/scsi/osd/
+@@ -49
24,6 +4924
,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
F: include/scsi/osd_*
F: fs/exofs/
diff --git
a/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
b/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
index 07b5f76688d813cb1d9ed67041a41d592e5d35a1..1659fda937a1e591c8d8b61b765cff916d9cef35 100644
(file)
--- a/
target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
+++ b/
target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
@@
-1,6
+1,6
@@
--- a/lib/Kconfig
+++ b/lib/Kconfig
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -20
4,16 +204
,16 @@ config BCH_CONST_T
+@@ -20
7,16 +207
,16 @@ config BCH_CONST_T
# Textsearch support is select'ed if needed
#
config TEXTSEARCH
# Textsearch support is select'ed if needed
#
config TEXTSEARCH
diff --git
a/target/linux/generic/patches-3.3/400-rootfs_split.patch
b/target/linux/generic/patches-3.3/400-rootfs_split.patch
index debe9304525243bbc90df30c2b7672a59b33811c..349185a30d3dd52f02bec9b1b717af2bfa871ca6 100644
(file)
--- a/
target/linux/generic/patches-3.3/400-rootfs_split.patch
+++ b/
target/linux/generic/patches-3.3/400-rootfs_split.patch
@@
-290,7
+290,7
@@
/*
* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver.
/*
* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver.
-@@ -50
4,6 +508
,7 @@ extern int mtd_device_parse_register(str
+@@ -50
2,6 +506
,7 @@ extern int mtd_device_parse_register(str
int defnr_parts);
#define mtd_device_register(master, parts, nr_parts) \
mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
int defnr_parts);
#define mtd_device_register(master, parts, nr_parts) \
mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
diff --git
a/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
b/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
index c51be071803303427da44b939cc0d44cc4e2805c..fa79ba313daff2286726a054e9b5aefced7a6da2 100644
(file)
--- a/
target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
+++ b/
target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
@@
-1049,7
+1049,7
@@
+#endif
--- a/lib/Kconfig
+++ b/lib/Kconfig
+#endif
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -11
5,6 +115
,12 @@ config LZO_DECOMPRESS
+@@ -11
8,6 +118
,12 @@ config LZO_DECOMPRESS
source "lib/xz/Kconfig"
source "lib/xz/Kconfig"
diff --git
a/target/linux/generic/patches-3.3/863-gpiommc.patch
b/target/linux/generic/patches-3.3/863-gpiommc.patch
index 9a5f811a756a4bd64b5928c9496a7b14f37c0165..3052a3830207f2eb88c47f62a1f4a8fa0c734469 100644
(file)
--- a/
target/linux/generic/patches-3.3/863-gpiommc.patch
+++ b/
target/linux/generic/patches-3.3/863-gpiommc.patch
@@
-830,7
+830,7
@@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -30
25,6 +3025
,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -30
19,6 +3019
,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
S: Odd Fixes
F: drivers/tty/hvc/
diff --git
a/target/linux/generic/patches-3.3/950-vm_exports.patch
b/target/linux/generic/patches-3.3/950-vm_exports.patch
index f0d9a64bf1091f437a992763f65f5b4e4d777058..5b5a17728a41624619522fe18585cf25d1ef7a77 100644
(file)
--- a/
target/linux/generic/patches-3.3/950-vm_exports.patch
+++ b/
target/linux/generic/patches-3.3/950-vm_exports.patch
@@
-61,7
+61,7
@@
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -38
61,6 +3861
,7 @@ int can_nice(const struct task_struct *p
+@@ -38
56,6 +3856
,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}