- up to 3.1.1

Changed files:
    kernel-multiarch.config -> 1.80
    kernel-vserver-2.3.patch -> 1.85
    kernel.spec -> 1.998

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 24f8e883c0aa801f197c5ddc4ba5396aed3e5653..c81cd889fc788876641a1f13a6ac530dcfe53b05 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -771,7 +771,7 @@ HIDRAW all=y
 #- 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_SERIAL_DEBUG all=m
 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

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index bfd669eea63e1c40afdecb18207e014824222118..2842517b89026100553aded5b98971cf21da0ad6 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -6732,12 +6732,13 @@ diff -NurpP --minimal linux-3.1/fs/namespace.c linux-3.1-vs2.3.1-rc2/fs/namespac
        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 @@ diff -NurpP --minimal linux-3.1/fs/namespace.c linux-3.1-vs2.3.1-rc2/fs/namespac
 -      }
 +              /* 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) {

diff --git a/kernel.spec b/kernel.spec
index 80040e8229186f85165248d8758868f041684dbc..0128f33fb6f1c6d0c743b4f2ddbbbffe4b385d08 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,7 +92,7 @@
 
 %define                rel             0.1
 %define                basever         3.1
-%define                postver         .0
+%define                postver         .1
 
 %define                module_init_tools_ver   3.16
 
@@ -137,7 +137,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # 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