Author: arekm Date: Fri Nov 11 22:15:18 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.1.1
---- Files affected:
packages/kernel:
kernel-multiarch.config (1.79 -> 1.80) , kernel-vserver-2.3.patch (1.84 ->
1.85) , kernel.spec (1.997 -> 1.998)
---- Diffs:
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.79
packages/kernel/kernel-multiarch.config:1.80
--- packages/kernel/kernel-multiarch.config:1.79 Sun Oct 30 07:20:24 2011
+++ packages/kernel/kernel-multiarch.config Fri Nov 11 23:15:13 2011
@@ -771,7 +771,7 @@
#- file drivers/hid/usbhid/Kconfig goes here
HID_A4TECH all=m
HID_ACRUX all=m
-HID_ACRUX_FF all=m
+HID_ACRUX_FF all=y
HID_APPLE all=m
HID_BELKIN all=m
HID_CHERRY all=m
@@ -5365,6 +5365,7 @@
USB_STORAGE all=m
USB_STORAGE_DEBUG all=n
USB_STORAGE_REALTEK all=m
+REALTEK_AUTOPM all=y
USB_STORAGE_DATAFAB all=m
USB_STORAGE_FREECOM all=m
USB_STORAGE_ISD200 all=m
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.84
packages/kernel/kernel-vserver-2.3.patch:1.85
--- packages/kernel/kernel-vserver-2.3.patch:1.84 Sun Oct 30 07:33:37 2011
+++ packages/kernel/kernel-vserver-2.3.patch Fri Nov 11 23:15:13 2011
@@ -6732,12 +6732,13 @@
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -1107,21 +1159,31 @@ static int show_vfsstat(struct seq_file
+@@ -1107,22 +1159,32 @@ static int show_vfsstat(struct seq_file
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
- /* device */
- if (mnt->mnt_sb->s_op->show_devname) {
+- seq_puts(m, "device ");
- err = mnt->mnt_sb->s_op->show_devname(m, mnt);
+ if (vx_flags(VXF_HIDE_MOUNT, 0))
+ return SEQ_SKIP;
@@ -6756,6 +6757,7 @@
- }
+ /* device */
+ if (mnt->mnt_sb->s_op->show_devname) {
++ seq_puts(m, "device ");
+ err = mnt->mnt_sb->s_op->show_devname(m, mnt);
+ } else {
+ if (mnt->mnt_devname) {
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.997 packages/kernel/kernel.spec:1.998
--- packages/kernel/kernel.spec:1.997 Thu Nov 10 17:01:31 2011
+++ packages/kernel/kernel.spec Fri Nov 11 23:15:13 2011
@@ -93,7 +93,7 @@
%define rel 0.1
%define basever 3.1
-%define postver .0
+%define postver .1
%define module_init_tools_ver 3.16
@@ -138,7 +138,7 @@
# Source0-md5: edbdc798f23ae0f8045c82f6fa22c536
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: 7526abc1f3df0506c71e0918ffaedb11
+# Patch0-md5: 8eb92cc70e7f8d1d18a349ba8c029d7d
%endif
Source3: kernel-autoconf.h
@@ -1502,6 +1502,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.998 2011/11/11 22:15:13 arekm
+- up to 3.1.1
+
Revision 1.997 2011/11/10 16:01:31 arekm
- die tuxonice, die -
http://lists.tuxonice.net/pipermail/tuxonice-devel/2011-November/007043.html
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.79&r2=1.80&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.84&r2=1.85&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.997&r2=1.998&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
