Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

2 files changed, 26 insertions, 11 deletions

diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile
index a61f40c71..1415db0e3 100644
--- a/target/linux/mpc52xx/Makefile
+++ b/target/linux/mpc52xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx
 CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
 FEATURES:=targz ext4
 
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.8.12
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc52xx/config-3.3 b/target/linux/mpc52xx/config-3.8
index 6aa64705f..591244154 100644
--- a/target/linux/mpc52xx/config-3.3
+++ b/target/linux/mpc52xx/config-3.8
@@ -7,16 +7,19 @@ CONFIG_6xx=y
 CONFIG_AMIGA_PARTITION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=y
@@ -24,16 +27,15 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BLK_DEV_SD=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
+CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="console=ttyPSC0,115200"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_COMPAT_BRK=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
@@ -41,7 +43,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DEFAULT_CFQ=y
@@ -53,7 +54,6 @@ CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED6xx is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPAPR_BOOT is not set
@@ -71,15 +71,20 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 # CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_TIME_VSYSCALL_OLD=y
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
+# CONFIG_GE_FPGA is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MPC5200=y
 # CONFIG_HAMRADIO is not set
@@ -91,6 +96,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -106,11 +112,12 @@ CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 # CONFIG_HVC_RTAS is not set
 CONFIG_HZ=250
@@ -128,6 +135,7 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
+CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_ISA_DMA_API=y
 CONFIG_JBD2=y
@@ -141,6 +149,7 @@ CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MMIO_NVRAM is not set
+CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MPC5200_WDT=y
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_U3_HT_IRQS is not set
@@ -157,7 +166,6 @@ CONFIG_NR_IRQS=512
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DEVICE=y
-CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
@@ -170,8 +178,8 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_MPC52xx=y
 CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_DOMAINS=y
+CONFIG_PERCPU_RWSEM=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PM=y
@@ -249,17 +257,22 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SOCK_DIAG=y
+CONFIG_SPARSE_IRQ=y
 # CONFIG_SQUASHFS is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SWIOTLB is not set
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_UIDGID_CONVERTED=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -268,3 +281,5 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_WATCHDOG_RTAS is not set
 CONFIG_WORD_SIZE=32
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_POWERPC=y