FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 01-04-2010, 05:27 PM
Tim Gardner
 
Default Lucid pull request, #499491

--
Tim Gardner tim.gardner@canonical.com
The following changes since commit 053e58a4a71a0b7b86440433f1b5562e1b4a31d9:
Tim Gardner (1):
UBUNTU: Bump ABI

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp499491

Tim Gardner (1):
UBUNTU: [Config] Build in TUN/TAP driver

debian.master/config/amd64/config.common.amd64 | 1 -
debian.master/config/armel/config.common.armel | 1 -
debian.master/config/config.common.ports | 1 +
debian.master/config/config.common.ubuntu | 1 +
debian.master/config/i386/config.common.i386 | 1 -
debian.master/config/ia64/config.common.ia64 | 1 -
debian.master/config/lpia/config.common.lpia | 1 -
debian.master/config/powerpc/config.common.powerpc | 1 -
debian.master/config/sparc/config.common.sparc | 1 -
9 files changed, 2 insertions(+), 7 deletions(-)
From 0d528a866f4203313ce3c6c6d60fcd9f4c735f9a Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Mon, 4 Jan 2010 08:57:20 -0700
Subject: [PATCH] UBUNTU: [Config] Build in TUN/TAP driver

BugLink: http://bugs.launchpad.net/bugs/499491

Changes in initramfs require that boot essential, non-device specific
drivers be built into the kernel.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 1 -
debian.master/config/armel/config.common.armel | 1 -
debian.master/config/config.common.ports | 1 +
debian.master/config/config.common.ubuntu | 1 +
debian.master/config/i386/config.common.i386 | 1 -
debian.master/config/ia64/config.common.ia64 | 1 -
debian.master/config/lpia/config.common.lpia | 1 -
debian.master/config/powerpc/config.common.powerpc | 1 -
debian.master/config/sparc/config.common.sparc | 1 -
9 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 70e981e..18cb8f6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -237,7 +237,6 @@ CONFIG_TCG_TPM=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TIPC=m
CONFIG_TTPCI_EEPROM=m
-CONFIG_TUN=m
CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_USB=y
CONFIG_USB_ARCH_HAS_EHCI=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 75c0d1d..4408ce4 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -215,7 +215,6 @@ CONFIG_STANDALONE=y
# CONFIG_TCP_CONG_ADVANCED is not set
# CONFIG_TIPC is not set
# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_TUN is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
CONFIG_USB=m
# CONFIG_USB_ARCH_HAS_EHCI is not set
diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index ca31a05..d1a4355 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -3368,6 +3368,7 @@ CONFIG_TULIP=m
# CONFIG_TULIP_MMIO is not set
# CONFIG_TULIP_MWI is not set
CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_TUN=y
# CONFIG_TUNE_CELL is not set
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_USB=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bea83c6..80d430b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3789,6 +3789,7 @@ CONFIG_TULIP=m
# CONFIG_TULIP_MMIO is not set
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_NAPI is not set
+CONFIG_TUN=y
CONFIG_TWL4030_CORE=y
# CONFIG_TWL4030_POWER is not set
CONFIG_TWL4030_USB=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6a5562d..f8cf60d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -235,7 +235,6 @@ CONFIG_TCG_TPM=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TIPC=m
CONFIG_TTPCI_EEPROM=m
-CONFIG_TUN=m
CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_USB=y
CONFIG_USB_ARCH_HAS_EHCI=y
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index cffa69d..c1ef412 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -235,7 +235,6 @@ CONFIG_TABLET_USB_WACOM=m
CONFIG_THERMAL=m
CONFIG_TR=y
# CONFIG_TULIP_NAPI is not set
-# CONFIG_TUN is not set
CONFIG_UBIFS_FS=m
# CONFIG_UFS_FS is not set
CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index b73a18a..6fdaf8e 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -244,7 +244,6 @@ CONFIG_TCG_TPM=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TIPC=m
CONFIG_TTPCI_EEPROM=m
-CONFIG_TUN=m
CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_USB=y
CONFIG_USB_ARCH_HAS_EHCI=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index bfcdb33..b76d0ca 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -206,7 +206,6 @@ CONFIG_SUNGEM=m
CONFIG_THERM_PM72=m
CONFIG_TR=y
# CONFIG_TULIP_NAPI is not set
-CONFIG_TUN=m
CONFIG_UFS_FS=m
CONFIG_ULTRIX_PARTITION=y
CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index 4a4cb58..9a1a495 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -244,7 +244,6 @@ CONFIG_SUNGEM=y
CONFIG_TPS65010=m
# CONFIG_TR is not set
CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
CONFIG_UBIFS_FS=m
CONFIG_UFS_FS=m
# CONFIG_ULTRIX_PARTITION is not set
--
1.6.2.4

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 01-05-2010, 05:15 PM
Andy Whitcroft
 
Default Lucid pull request, #499491

Applied to Lucid.

-apw

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 01:27 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org