Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (7652aab7) · Commits · e / devices / android_kernel_teracube_2e

Documentation/feature-removal-schedule.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -149,3 +149,13 @@ Files: drivers/md/md.c
		Why: Not reliable by design - can fail when most needed.
		Alternatives exist
		Who: NeilBrown <neilb@suse.de>

		---------------------------

		What: au1x00_uart driver
		When: January 2006
		Why: The 8250 serial driver now has the ability to deal with the differences
		between the standard 8250 family of UARTs and their slightly strange
		brother on Alchemy SOCs. The loss of features is not considered an
		issue.
		Who: Ralf Baechle <ralf@linux-mips.org>

arch/mips/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -700,6 +700,7 @@ load-$(CONFIG_SNI_RM200_PCI) += 0xffffffff80600000
		#
		core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \
		arch/mips/jmr3927/common/
		cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
		load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000

		#

arch/mips/au1000/common/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ void __init plat_setup(void)

		argptr = prom_getcmdline();

		#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
		#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) \|\| defined(CONFIG_SERIAL_8250_CONSOLE)
		if ((argptr = strstr(argptr, "console=")) == NULL) {
		argptr = prom_getcmdline();
		strcat(argptr, " console=ttyS0,115200");

arch/mips/configs/atlas_defconfig

+51 −16

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:13 2005
		# Linux kernel version: 2.6.14
		# Thu Nov 10 12:14:02 2005
		#
		CONFIG_MIPS=y

		@@ -56,6 +56,24 @@ CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y

		#
		# Block layer
		#
		# CONFIG_LBD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -191,6 +209,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		@@ -309,6 +328,10 @@ CONFIG_IPV6_TUNNEL=m
		CONFIG_NETFILTER=y
		# CONFIG_NETFILTER_DEBUG is not set
		CONFIG_BRIDGE_NETFILTER=y

		#
		# Core Netfilter Configuration
		#
		CONFIG_NETFILTER_NETLINK=m
		CONFIG_NETFILTER_NETLINK_QUEUE=m
		CONFIG_NETFILTER_NETLINK_LOG=m
		@@ -363,6 +386,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
		CONFIG_IP_NF_TARGET_LOG=m
		CONFIG_IP_NF_TARGET_ULOG=m
		CONFIG_IP_NF_TARGET_TCPMSS=m
		CONFIG_IP_NF_TARGET_NFQUEUE=m
		CONFIG_IP_NF_NAT=m
		CONFIG_IP_NF_NAT_NEEDED=y
		CONFIG_IP_NF_TARGET_MASQUERADE=m
		@@ -412,6 +436,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
		CONFIG_IP6_NF_FILTER=m
		CONFIG_IP6_NF_TARGET_LOG=m
		CONFIG_IP6_NF_TARGET_REJECT=m
		CONFIG_IP6_NF_TARGET_NFQUEUE=m
		CONFIG_IP6_NF_MANGLE=m
		CONFIG_IP6_NF_TARGET_MARK=m
		CONFIG_IP6_NF_TARGET_HL=m
		@@ -472,10 +497,18 @@ CONFIG_IPDDP_DECAP=y
		CONFIG_NET_DIVERT=y
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		CONFIG_NET_SCHED=y
		CONFIG_NET_SCH_CLK_JIFFIES=y
		# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
		# CONFIG_NET_SCH_CLK_CPU is not set

		#
		# Queueing/Scheduling
		#
		CONFIG_NET_SCH_CBQ=m
		CONFIG_NET_SCH_HTB=m
		CONFIG_NET_SCH_HFSC=m
		@@ -488,8 +521,10 @@ CONFIG_NET_SCH_GRED=m
		CONFIG_NET_SCH_DSMARK=m
		CONFIG_NET_SCH_NETEM=m
		CONFIG_NET_SCH_INGRESS=m
		CONFIG_NET_QOS=y
		CONFIG_NET_ESTIMATOR=y

		#
		# Classification
		#
		CONFIG_NET_CLS=y
		CONFIG_NET_CLS_BASIC=m
		CONFIG_NET_CLS_TCINDEX=m
		@@ -498,13 +533,14 @@ CONFIG_NET_CLS_ROUTE=y
		CONFIG_NET_CLS_FW=m
		CONFIG_NET_CLS_U32=m
		# CONFIG_CLS_U32_PERF is not set
		CONFIG_NET_CLS_IND=y
		# CONFIG_CLS_U32_MARK is not set
		CONFIG_NET_CLS_RSVP=m
		CONFIG_NET_CLS_RSVP6=m
		# CONFIG_NET_EMATCH is not set
		# CONFIG_NET_CLS_ACT is not set
		CONFIG_NET_CLS_POLICE=y
		CONFIG_NET_CLS_IND=y
		CONFIG_NET_ESTIMATOR=y

		#
		# Network testing
		@@ -565,18 +601,9 @@ CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=16
		CONFIG_BLK_DEV_RAM_SIZE=4096
		# CONFIG_BLK_DEV_INITRD is not set
		# CONFIG_LBD is not set
		CONFIG_CDROM_PKTCDVD=m
		CONFIG_CDROM_PKTCDVD_BUFFERS=8
		# CONFIG_CDROM_PKTCDVD_WCACHE is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_ATA_OVER_ETH=m

		#
		@@ -643,6 +670,7 @@ CONFIG_SCSI_SAS_ATTRS=m
		#
		# SCSI low-level drivers
		#
		CONFIG_ISCSI_TCP=m
		# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
		# CONFIG_SCSI_3W_9XXX is not set
		# CONFIG_SCSI_ACARD is not set
		@@ -653,6 +681,7 @@ CONFIG_SCSI_SAS_ATTRS=m
		# CONFIG_SCSI_DPT_I2O is not set
		# CONFIG_MEGARAID_NEWGEN is not set
		# CONFIG_MEGARAID_LEGACY is not set
		# CONFIG_MEGARAID_SAS is not set
		# CONFIG_SCSI_SATA is not set
		# CONFIG_SCSI_DMX3191D is not set
		# CONFIG_SCSI_FUTURE_DOMAIN is not set
		@@ -707,6 +736,7 @@ CONFIG_DM_MULTIPATH_EMC=m
		# CONFIG_FUSION is not set
		# CONFIG_FUSION_SPI is not set
		# CONFIG_FUSION_FC is not set
		# CONFIG_FUSION_SAS is not set

		#
		# IEEE 1394 (FireWire) support
		@@ -736,7 +766,6 @@ CONFIG_TUN=m
		# PHY device support
		#
		CONFIG_PHYLIB=m
		CONFIG_PHYCONTROL=y

		#
		# MII PHY device drivers
		@@ -754,6 +783,7 @@ CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -933,6 +963,7 @@ CONFIG_LEGACY_PTY_COUNT=256
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -991,6 +1022,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#
		@@ -1037,7 +1072,7 @@ CONFIG_JFS_SECURITY=y
		CONFIG_FS_POSIX_ACL=y
		CONFIG_XFS_FS=m
		CONFIG_XFS_EXPORT=y
		CONFIG_XFS_QUOTA=m
		CONFIG_XFS_QUOTA=y
		CONFIG_XFS_SECURITY=y
		CONFIG_XFS_POSIX_ACL=y
		# CONFIG_XFS_RT is not set

arch/mips/configs/bigsur_defconfig

+35 −12

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:17 2005
		# Linux kernel version: 2.6.14
		# Mon Nov 7 23:04:36 2005
		#
		CONFIG_MIPS=y

		@@ -60,6 +60,23 @@ CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y
		CONFIG_STOP_MACHINE=y

		#
		# Block layer
		#

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -127,8 +144,8 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
		# CONFIG_CPU_SB1_PASS_2_112x is not set
		# CONFIG_CPU_SB1_PASS_3 is not set
		# CONFIG_SIMULATION is not set
		# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set
		# CONFIG_CONFIG_SB1_CERR_STALL is not set
		# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
		# CONFIG_SB1_CERR_STALL is not set
		CONFIG_SIBYTE_CFE=y
		# CONFIG_SIBYTE_CFE_CONSOLE is not set
		# CONFIG_SIBYTE_BUS_WATCHER is not set
		@@ -198,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_SMP=y
		CONFIG_NR_CPUS=4
		CONFIG_PREEMPT_NONE=y
		@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		@@ -353,14 +375,6 @@ CONFIG_BLK_DEV_NBD=m
		# CONFIG_BLK_DEV_RAM is not set
		CONFIG_BLK_DEV_RAM_COUNT=16
		# CONFIG_CDROM_PKTCDVD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		# CONFIG_ATA_OVER_ETH is not set

		#
		@@ -443,6 +457,7 @@ CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -582,6 +597,7 @@ CONFIG_GEN_RTC=y
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -634,6 +650,7 @@ CONFIG_SENSORS_PCA9539=y
		CONFIG_SENSORS_PCF8591=y
		CONFIG_SENSORS_RTC8564=y
		CONFIG_SENSORS_MAX6875=y
		# CONFIG_RTC_X1205_I2C is not set
		CONFIG_I2C_DEBUG_CORE=y
		CONFIG_I2C_DEBUG_ALGO=y
		CONFIG_I2C_DEBUG_BUS=y
		@@ -685,6 +702,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#
		@@ -823,6 +844,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
		# CONFIG_DEBUG_KOBJECT is not set
		# CONFIG_DEBUG_INFO is not set
		# CONFIG_DEBUG_FS is not set
		# CONFIG_DEBUG_VM is not set
		# CONFIG_RCU_TORTURE_TEST is not set
		CONFIG_CROSSCOMPILE=y
		CONFIG_CMDLINE=""
		# CONFIG_DEBUG_STACK_USAGE is not set