mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 07:45:32 +02:00
[generic/3.3]: refresh patches to -rc3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30456 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a6fcd662b4
commit
06d33a010d
@ -244,7 +244,7 @@
|
||||
========================
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -4930,6 +4930,13 @@ F: drivers/scsi/osd/
|
||||
@@ -4924,6 +4924,13 @@ F: drivers/scsi/osd/
|
||||
F: include/scsi/osd_*
|
||||
F: fs/exofs/
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/lib/Kconfig
|
||||
+++ b/lib/Kconfig
|
||||
@@ -204,16 +204,16 @@ config BCH_CONST_T
|
||||
@@ -207,16 +207,16 @@ config BCH_CONST_T
|
||||
# Textsearch support is select'ed if needed
|
||||
#
|
||||
config TEXTSEARCH
|
||||
|
@ -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.
|
||||
@@ -504,6 +508,7 @@ extern int mtd_device_parse_register(str
|
||||
@@ -502,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)
|
||||
|
@ -1049,7 +1049,7 @@
|
||||
+#endif
|
||||
--- a/lib/Kconfig
|
||||
+++ b/lib/Kconfig
|
||||
@@ -115,6 +115,12 @@ config LZO_DECOMPRESS
|
||||
@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
|
||||
|
||||
source "lib/xz/Kconfig"
|
||||
|
||||
|
@ -830,7 +830,7 @@
|
||||
+be done automatically.
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -3025,6 +3025,11 @@ L: linuxppc-dev@lists.ozlabs.org
|
||||
@@ -3019,6 +3019,11 @@ L: linuxppc-dev@lists.ozlabs.org
|
||||
S: Odd Fixes
|
||||
F: drivers/tty/hvc/
|
||||
|
||||
|
@ -61,7 +61,7 @@
|
||||
{
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -3861,6 +3861,7 @@ int can_nice(const struct task_struct *p
|
||||
@@ -3856,6 +3856,7 @@ int can_nice(const struct task_struct *p
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user