Merge remote-tracking branch 'upstream/master' into openelec-settings

packages/3rdparty/multimedia/vdr/meta

@@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
 PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="fontconfig freetype libcap"
-PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/devel/libcec/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.0.5"
+PKG_VERSION="2.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-firmware/wlan-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.9"
+PKG_VERSION="0.0.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/mediacenter/xbmc/init.d/92_setup-xbmc

@@ -24,15 +24,6 @@
 
 progress "setup XBMC"
 
-#
-# clean temp dir
-#
-  # hack... we should always clean this temp dir, but we should keep
-  # the logfiles in debug mode
-  if [ ! "$DEBUG" = "yes" ]; then
-    rm -rf $HOME/.xbmc/temp/*
-  fi
-
 #
 # add some default settings
 #

packages/mediacenter/xbmc/patches/xbmc-990.15-PR2323.patch

@@ -0,0 +1,47 @@
+--- xbmc-12.0.3/configure.in.orig	2013-03-01 13:21:58.791312360 +0100
++++ xbmc-12.0.3/configure.in	2013-03-01 13:38:41.138311757 +0100
+@@ -990,9 +990,15 @@
+ AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
+ if echo "$ARCH" | grep -q freebsd; then
+ AC_CHECK_LIB([pthread],     [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
++AC_CHECK_LIB([pthread],     [pthread_set_name_np],
++  AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP],[1],["Define to 1 if pthread has pthread_set_name_np"]),
++  AC_MSG_RESULT([Could not find pthread_set_name_np in pthread]))
+ else
+ if test "$target_platform" != "target_android" ; then
+   AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
++  AC_CHECK_LIB([pthread],     [pthread_setname_np],
++    AC_DEFINE([HAVE_PTHREAD_SETNAME_NP],[1],["Define to 1 if pthread has pthread_setname_np"]),
++    AC_MSG_RESULT([Could not find pthread_setname_np in pthread]))
+ fi
+ fi
+ AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
+--- xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2013-03-01 14:40:50.080309513 +0100
++++ xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp	2013-03-01 14:40:20.548309531 +0100
+@@ -18,6 +18,9 @@
+  *
+  */
+ 
++#if (defined HAVE_CONFIG_H) && (!defined WIN32)
++  #include "config.h"
++#endif
+ #include <limits.h>
+ #if defined(TARGET_ANDROID)
+ #include <unistd.h>
+@@ -71,10 +74,16 @@
+   m_ThreadOpaque.LwpId = syscall(SYS_gettid);
+ #endif
+ 
++#if defined(HAVE_PTHREAD_SETNAME_NP)
+ #ifdef TARGET_DARWIN
+ #if(__MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30200)
+   pthread_setname_np(m_ThreadName.c_str());
+ #endif
++#else
++  pthread_setname_np(m_ThreadId, m_ThreadName.c_str());
++#endif
++#elif defined(HAVE_PTHREAD_SET_NAME_NP)
++  pthread_set_name_np(m_ThreadId, m_ThreadName.c_str());
+ #endif
+     
+ #ifdef RLIMIT_NICE

packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch

@@ -0,0 +1,309 @@
+From 0a2c144355ed750e61fadabe2dde185a76064f0a Mon Sep 17 00:00:00 2001
+From: montellese <montellese@xbmc.org>
+Date: Fri, 1 Mar 2013 17:53:54 +0100
+Subject: [PATCH] websocket: fix inability to handle multiple queued websocket
+ frames/messages (fixes #13848)
+
+---
+ xbmc/network/TCPServer.cpp           |   31 +++---
+ xbmc/network/websocket/WebSocket.cpp |  174 +++++++++++++++++++---------------
+ xbmc/network/websocket/WebSocket.h   |    2 +-
+ 3 files changed, 114 insertions(+), 93 deletions(-)
+
+diff --git a/xbmc/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp
+index 2d9fde0..e4b5984 100644
+--- a/xbmc/network/TCPServer.cpp
++++ b/xbmc/network/TCPServer.cpp
+@@ -654,23 +654,28 @@ void CTCPServer::CWebSocketClient::Send(const char *data, unsigned int size)
+ void CTCPServer::CWebSocketClient::PushBuffer(CTCPServer *host, const char *buffer, int length)
+ {
+   bool send;
+-  const CWebSocketMessage *msg;
+-  if ((msg = m_websocket->Handle(buffer, length, send)) != NULL && msg->IsComplete())
++  const CWebSocketMessage *msg = NULL;
++  size_t len = length;
++  do
+   {
+-    std::vector<const CWebSocketFrame *> frames = msg->GetFrames();
+-    if (send)
+-    {
+-      for (unsigned int index = 0; index < frames.size(); index++)
+-        Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength());
+-    }
+-    else
++    if ((msg = m_websocket->Handle(buffer, len, send)) != NULL && msg->IsComplete())
+     {
+-      for (unsigned int index = 0; index < frames.size(); index++)
+-        CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength());
+-    }
++      std::vector<const CWebSocketFrame *> frames = msg->GetFrames();
++      if (send)
++      {
++        for (unsigned int index = 0; index < frames.size(); index++)
++          Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength());
++      }
++      else
++      {
++        for (unsigned int index = 0; index < frames.size(); index++)
++          CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength());
++      }
+ 
+-    delete msg;
++      delete msg;
++    }
+   }
++  while (len > 0 && msg != NULL);
+ 
+   if (m_websocket->GetState() == WebSocketStateClosed)
+     Disconnect();
+diff --git a/xbmc/network/websocket/WebSocket.cpp b/xbmc/network/websocket/WebSocket.cpp
+index 94e7ab0..5008073 100644
+--- a/xbmc/network/websocket/WebSocket.cpp
++++ b/xbmc/network/websocket/WebSocket.cpp
+@@ -80,11 +80,11 @@
+   // Get the MASK flag
+   m_masked = ((m_data[1] & MASK_MASK) == MASK_MASK);
+ 
+-  // Get the playload length
++  // Get the payload length
+   m_length = (uint64_t)(m_data[1] & MASK_LENGTH);
+-  if ((m_length <= 125 && length  < m_length + LENGTH_MIN) ||
+-      (m_length == 126 && length < LENGTH_MIN + 2) ||
+-      (m_length == 127 && length < LENGTH_MIN + 8))
++  if ((m_length <= 125 && m_lengthFrame  < m_length + LENGTH_MIN) ||
++      (m_length == 126 && m_lengthFrame < LENGTH_MIN + 2) ||
++      (m_length == 127 && m_lengthFrame < LENGTH_MIN + 8))
+   {
+     CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
+     reset();
+@@ -110,7 +110,7 @@
+     offset = 8;
+   }
+ 
+-  if (length < LENGTH_MIN + offset + m_length)
++  if (m_lengthFrame < LENGTH_MIN + offset + m_length)
+   {
+     CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
+     reset();
+@@ -124,12 +124,8 @@
+     offset += 4;
+   }
+ 
+-  if (length != LENGTH_MIN + offset + m_length)
+-  {
+-    CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
+-    reset();
+-    return;
+-  }
++  if (m_lengthFrame != LENGTH_MIN + offset + m_length)
++    m_lengthFrame = LENGTH_MIN + offset + m_length;
+ 
+   // Get application data
+   if (m_length > 0)
+@@ -305,102 +301,122 @@ void CWebSocketMessage::Clear()
+   m_frames.clear();
+ }
+ 
+-const CWebSocketMessage* CWebSocket::Handle(const char *buffer, size_t length, bool &send)
++const CWebSocketMessage* CWebSocket::Handle(const char* &buffer, size_t &length, bool &send)
+ {
+   send = false;
+ 
+-  switch (m_state)
++  while (length > 0)
+   {
+-    case WebSocketStateConnected:
++    switch (m_state)
+     {
+-      CWebSocketFrame *frame = GetFrame(buffer, length);
+-      if (!frame->IsValid())
++      case WebSocketStateConnected:
+       {
+-        CLog::Log(LOGINFO, "WebSocket: Invalid frame received");
+-        delete frame;
+-        return NULL;
+-      }
+-
+-      if (frame->IsControlFrame())
+-      {
+-        if (!frame->IsFinal())
++        CWebSocketFrame *frame = GetFrame(buffer, length);
++        if (!frame->IsValid())
+         {
++          CLog::Log(LOGINFO, "WebSocket: Invalid frame received");
+           delete frame;
+           return NULL;
+         }
+ 
+-        CWebSocketMessage *msg = NULL;
+-        switch (frame->GetOpcode())
++        // adjust the length and the buffer values
++        length -= frame->GetFrameLength();
++        buffer += frame->GetFrameLength();
++
++        if (frame->IsControlFrame())
+         {
+-          case WebSocketPing:
+-            msg = GetMessage();
+-            if (msg != NULL)
+-              msg->AddFrame(Pong(frame->GetApplicationData()));
+-            break;
++          if (!frame->IsFinal())
++          {
++            delete frame;
++            return NULL;
++          }
++
++          CWebSocketMessage *msg = NULL;
++          switch (frame->GetOpcode())
++          {
++            case WebSocketPing:
++              msg = GetMessage();
++              if (msg != NULL)
++                msg->AddFrame(Pong(frame->GetApplicationData()));
++              break;
+             
+-          case WebSocketConnectionClose:
+-            CLog::Log(LOGINFO, "WebSocket: connection closed by client");
+-
+-            msg = GetMessage();
+-            if (msg != NULL)
+-              msg->AddFrame(Close());
+-
+-            m_state = WebSocketStateClosed;
+-            break;
+-
+-          case WebSocketContinuationFrame:
+-          case WebSocketTextFrame:
+-          case WebSocketBinaryFrame:
+-          case WebSocketPong:
+-          case WebSocketUnknownFrame:
+-          default:
+-            break;
++            case WebSocketConnectionClose:
++              CLog::Log(LOGINFO, "WebSocket: connection closed by client");
++
++              msg = GetMessage();
++              if (msg != NULL)
++                msg->AddFrame(Close());
++
++              m_state = WebSocketStateClosed;
++              break;
++
++            case WebSocketContinuationFrame:
++            case WebSocketTextFrame:
++            case WebSocketBinaryFrame:
++            case WebSocketPong:
++            case WebSocketUnknownFrame:
++            default:
++              break;
++          }
++
++          delete frame;
++
++          if (msg != NULL)
++            send = true;
++
++          return msg;
+         }
+ 
+-        delete frame;
++        if (m_message == NULL && (m_message = GetMessage()) == NULL)
++        {
++          CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message");
++          delete frame;
++          return NULL;
++        }
+ 
+-        if (msg != NULL)
+-          send = true;
++        m_message->AddFrame(frame);
++        if (!m_message->IsComplete())
++        {
++          if (length > 0)
++            continue;
++          else
++            return NULL;
++        }
+ 
++        CWebSocketMessage *msg = m_message;
++        m_message = NULL;
+         return msg;
+       }
+ 
+-      if (m_message == NULL && (m_message = GetMessage()) == NULL)
++      case WebSocketStateClosing:
+       {
+-        CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message");
+-        delete frame;
+-        return NULL;
+-      }
++        CWebSocketFrame *frame = GetFrame(buffer, length);
+ 
+-      m_message->AddFrame(frame);
+-      if (!m_message->IsComplete())
+-        return NULL;
++        if (frame->IsValid())
++        {
++          // adjust the length and the buffer values
++          length -= frame->GetFrameLength();
++          buffer += frame->GetFrameLength();
++        }
+ 
+-      CWebSocketMessage *msg = m_message;
+-      m_message = NULL;
+-      return msg;
+-    }
++        if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose)
++        {
++          CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)");
++          delete frame;
++          return NULL;
++        }
+ 
+-    case WebSocketStateClosing:
+-    {
+-      CWebSocketFrame *frame = GetFrame(buffer, length);
+-      if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose)
+-      {
+-        CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)");
+-        delete frame;
++        m_state = WebSocketStateClosed;
+         return NULL;
+       }
+ 
+-      m_state = WebSocketStateClosed;
+-      return NULL;
++      case WebSocketStateNotConnected:
++      case WebSocketStateClosed:
++      case WebSocketStateHandshaking:
++      default:
++        CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state");
++        return NULL;
+     }
+-
+-    case WebSocketStateNotConnected:
+-    case WebSocketStateClosed:
+-    case WebSocketStateHandshaking:
+-    default:
+-      CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state");
+-      return NULL;
+   }
+ 
+   return NULL;
+diff --git a/xbmc/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h
+index bbfaa89..e0d3cae 100644
+--- a/xbmc/network/websocket/WebSocket.h
++++ b/xbmc/network/websocket/WebSocket.h
+@@ -122,7 +122,7 @@ class CWebSocket
+   WebSocketState GetState() { return m_state; }
+ 
+   virtual bool Handshake(const char* data, size_t length, std::string &response) = 0;
+-  virtual const CWebSocketMessage* Handle(const char *buffer, size_t length, bool &send);
++  virtual const CWebSocketMessage* Handle(const char* &buffer, size_t &length, bool &send);
+   virtual const CWebSocketMessage* Send(WebSocketFrameOpcode opcode, const char* data = NULL, uint32_t length = 0);
+   virtual const CWebSocketFrame* Ping(const char* data = NULL) const = 0;
+   virtual const CWebSocketFrame* Pong(const char* data = NULL) const = 0;
+-- 
+1.7.10
+

projects/ARCTIC_MC/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -2928,14 +2928,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3010,7 +3003,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3032,7 +3024,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/ATV/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -430,7 +430,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -448,7 +448,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_HOTPLUG_CPU is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs processor.max_cstate=2"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2"
 # CONFIG_CMDLINE_OVERRIDE is not set
 
 #
@@ -1129,10 +1129,7 @@ CONFIG_PATA_ACPI=y
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_NET is not set
+# CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
@@ -1190,8 +1187,8 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 CONFIG_8139TOO=y
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 # CONFIG_R8169 is not set
@@ -1885,11 +1882,6 @@ CONFIG_TTPCI_EEPROM=m
 #
 # Supported MMC/SDIO adapters
 #
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-# CONFIG_DVB_FIREDTV is not set
 CONFIG_DVB_B2C2_FLEXCOP=m
 # CONFIG_SAA716X_SUPPORT is not set
 CONFIG_SMS_SIANO_MDTV=m
@@ -2317,7 +2309,6 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_US122L is not set
 # CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 
@@ -2844,14 +2835,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -2926,7 +2910,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -2948,7 +2931,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -3086,7 +3068,6 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set

projects/Fusion/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -420,7 +420,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -439,7 +439,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3151,14 +3151,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3233,7 +3226,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3255,7 +3247,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Fusion/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -393,7 +393,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -412,7 +412,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3095,14 +3095,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3177,7 +3170,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3199,7 +3191,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Generic/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -424,7 +424,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -443,7 +443,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -1257,8 +1257,8 @@ CONFIG_QLA3XXX=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 CONFIG_8139TOO=y
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=y
@@ -3333,14 +3333,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3415,7 +3408,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3437,7 +3429,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Generic_OSS/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -424,7 +424,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -443,7 +443,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -1255,8 +1255,8 @@ CONFIG_QLA3XXX=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 CONFIG_8139TOO=y
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=y
@@ -3336,14 +3336,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3418,7 +3411,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3440,7 +3432,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/ION/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -422,7 +422,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -441,7 +441,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3181,14 +3181,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3263,7 +3256,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3285,7 +3277,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/ION/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3107,14 +3107,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3189,7 +3182,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3211,7 +3203,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Intel/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -423,7 +423,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -442,7 +442,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3228,14 +3228,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3310,7 +3303,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3332,7 +3324,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Intel/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -390,7 +390,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -408,7 +408,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3155,14 +3155,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3237,7 +3230,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3259,7 +3251,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/RPi/linux/linux.arm.conf

@@ -2172,14 +2172,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -2252,7 +2245,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -2273,7 +2265,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_XATTR is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Ultra/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -1080,10 +1080,7 @@ CONFIG_ATA_GENERIC=y
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_NET is not set
+# CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
@@ -1941,11 +1938,6 @@ CONFIG_TTPCI_EEPROM=m
 #
 # Supported MMC/SDIO adapters
 #
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-# CONFIG_DVB_FIREDTV is not set
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_SAA716X_SUPPORT=y
 CONFIG_SAA716X_CORE=m
@@ -2358,7 +2350,6 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_US122L is not set
 # CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 
@@ -2893,14 +2884,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -2975,7 +2959,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -2997,7 +2980,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -3136,7 +3118,6 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set

projects/Virtual/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6 Kernel Configuration
+# Linux/i386 3.7.10 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -421,7 +421,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -440,7 +440,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3225,14 +3225,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3307,7 +3300,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3329,7 +3321,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

projects/Virtual/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6 Kernel Configuration
+# Linux/x86_64 3.7.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -387,7 +387,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
+# CONFIG_X86_SMAP is not set
 CONFIG_EFI=y
 # CONFIG_EFI_STUB is not set
 CONFIG_SECCOMP=y
@@ -405,7 +405,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
@@ -3151,14 +3151,7 @@ CONFIG_FUSE_FS=y
 #
 # Caches
 #
-CONFIG_FSCACHE=y
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3233,7 +3226,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
@@ -3255,7 +3247,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set