make all 3.6 patches apply and build
authorFlorian Fainelli <florian@openwrt.org>
Wed, 24 Oct 2012 13:05:22 +0000 (13:05 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Wed, 24 Oct 2012 13:05:22 +0000 (13:05 +0000)
SVN-Revision: 33911

104 files changed:
target/linux/generic/config-3.6 [new file with mode: 0644]
target/linux/generic/patches-3.6/060-hso_devices.patch
target/linux/generic/patches-3.6/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
target/linux/generic/patches-3.6/100-overlayfs.patch
target/linux/generic/patches-3.6/102-ehci_hcd_ignore_oc.patch
target/linux/generic/patches-3.6/200-fix_localversion.patch
target/linux/generic/patches-3.6/201-extra_optimization.patch
target/linux/generic/patches-3.6/202-reduce_module_size.patch
target/linux/generic/patches-3.6/211-stddef_include.patch
target/linux/generic/patches-3.6/220-module_exports.patch
target/linux/generic/patches-3.6/250-netfilter_depends.patch
target/linux/generic/patches-3.6/252-mv_cesa_depends.patch
target/linux/generic/patches-3.6/254-textsearch_kconfig_hacks.patch
target/linux/generic/patches-3.6/255-lib80211_kconfig_hacks.patch
target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
target/linux/generic/patches-3.6/301-mips_image_cmdline_hack.patch
target/linux/generic/patches-3.6/304-mips_disable_fpu.patch
target/linux/generic/patches-3.6/305-mips_module_reloc.patch
target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch
target/linux/generic/patches-3.6/308-mips-show-correct-cpu-name-for-24KEc.patch
target/linux/generic/patches-3.6/320-ppc4xx_optimization.patch
target/linux/generic/patches-3.6/321-powerpc_crtsavres_prereq.patch
target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch
target/linux/generic/patches-3.6/331-mips-kexec-enhanche-the-support.patch
target/linux/generic/patches-3.6/340-module_alloc_size_check.patch
target/linux/generic/patches-3.6/400-rootfs_split.patch
target/linux/generic/patches-3.6/401-partial_eraseblock_write.patch
target/linux/generic/patches-3.6/420-redboot_space.patch
target/linux/generic/patches-3.6/421-redboot_boardconfig.patch
target/linux/generic/patches-3.6/440-block2mtd_init.patch
target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
target/linux/generic/patches-3.6/442-block2mtd_probe.patch
target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch
target/linux/generic/patches-3.6/460-cfi_cmdset_0002_no_erase_suspend.patch
target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
target/linux/generic/patches-3.6/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
target/linux/generic/patches-3.6/477-mtd-m25p80-add-support-for-the-EON-EN25Q64-chip.patch
target/linux/generic/patches-3.6/478-mtd-partial_eraseblock_unlock.patch
target/linux/generic/patches-3.6/500-yaffs_support.patch
target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch
target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch
target/linux/generic/patches-3.6/540-crypto-xz-decompression-support.patch
target/linux/generic/patches-3.6/541-ubifs-xz-decompression-support.patch
target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch
target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch
target/linux/generic/patches-3.6/603-netfilter_layer7_2.6.36_fix.patch
target/linux/generic/patches-3.6/604-netfilter_cisco_794x_iphone.patch
target/linux/generic/patches-3.6/610-netfilter_match_bypass_default_checks.patch
target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch
target/linux/generic/patches-3.6/613-netfilter_optional_tcp_window_check.patch
target/linux/generic/patches-3.6/620-sched_esfq.patch
target/linux/generic/patches-3.6/621-sched_act_connmark.patch
target/linux/generic/patches-3.6/630-packet_socket_type.patch
target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch
target/linux/generic/patches-3.6/644-bridge_optimize_netfilter_hooks.patch
target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
target/linux/generic/patches-3.6/651-wireless_mesh_header.patch
target/linux/generic/patches-3.6/653-disable_netlink_trim.patch
target/linux/generic/patches-3.6/655-increase_skb_pad.patch
target/linux/generic/patches-3.6/700-swconfig.patch
target/linux/generic/patches-3.6/701-phy_extension.patch
target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch
target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
target/linux/generic/patches-3.6/720-phy_adm6996.patch
target/linux/generic/patches-3.6/721-phy_packets.patch
target/linux/generic/patches-3.6/722-phy_mvswitch.patch
target/linux/generic/patches-3.6/723-phy_ip175c.patch
target/linux/generic/patches-3.6/724-phy_ar8216.patch
target/linux/generic/patches-3.6/725-phy_rtl8306.patch
target/linux/generic/patches-3.6/726-phy_rtl8366.patch
target/linux/generic/patches-3.6/727-phy-rtl8367.patch
target/linux/generic/patches-3.6/728-phy-micrel.patch
target/linux/generic/patches-3.6/729-phy-rtl8367b.patch
target/linux/generic/patches-3.6/729-phy-tantos.patch
target/linux/generic/patches-3.6/750-hostap_txpower.patch
target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch
target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch
target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
target/linux/generic/patches-3.6/830-ledtrig_morse.patch
target/linux/generic/patches-3.6/831-ledtrig_netdev.patch
target/linux/generic/patches-3.6/832-ledtrig_usbdev.patch
target/linux/generic/patches-3.6/840-rtc7301.patch
target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
target/linux/generic/patches-3.6/862-gpio_spi_driver.patch
target/linux/generic/patches-3.6/863-gpiommc.patch
target/linux/generic/patches-3.6/865-gpiopwm.patch
target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
target/linux/generic/patches-3.6/900-slab_maxsize.patch
target/linux/generic/patches-3.6/910-kobject_uevent.patch
target/linux/generic/patches-3.6/911-kobject_add_broadcast_uevent.patch
target/linux/generic/patches-3.6/920-unable_to_open_console.patch
target/linux/generic/patches-3.6/921-use_preinit_as_init.patch
target/linux/generic/patches-3.6/930-crashlog.patch
target/linux/generic/patches-3.6/940-ocf_kbuild_integration.patch
target/linux/generic/patches-3.6/941-ocf_20120127.patch
target/linux/generic/patches-3.6/950-vm_exports.patch
target/linux/generic/patches-3.6/980-update_arm_machtypes.patch
target/linux/generic/patches-3.6/992-mpcore_wdt_fix_watchdog_counter_loading.patch
target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch

diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
new file mode 100644 (file)
index 0000000..4abc434
--- /dev/null
@@ -0,0 +1,3201 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/mips 3.6.3 Kernel Configuration
+#
+CONFIG_MIPS=y
+
+#
+# Machine selection
+#
+CONFIG_ZONE_DMA=y
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_AR7 is not set
+# CONFIG_ATH79 is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LASAT is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+CONFIG_MIPS_MALTA=y
+# CONFIG_MIPS_SIM is not set
+# CONFIG_NEC_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_POWERTV is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_I8259=y
+CONFIG_MIPS_BONITO64=y
+# CONFIG_MIPS_FPU_EMU is not set
+CONFIG_MIPS_MSC=y
+# CONFIG_MIPS_MACHINE is not set
+CONFIG_IMAGE_CMDLINE_HACK=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_GIC=y
+CONFIG_MIPS_BOARDS_GEN=y
+CONFIG_PCI_GT64XXX_PCI0=y
+CONFIG_SWAP_IO_SPACE=y
+CONFIG_BOOT_ELF32=y
+CONFIG_MIPS_L1_CACHE_SHIFT=6
+
+#
+# CPU selection
+#
+# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R2=y
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_RM7000 is not set
+CONFIG_SYS_SUPPORTS_ZBOOT=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_CPU_MIPS32_R2=y
+CONFIG_SYS_HAS_CPU_MIPS64_R1=y
+CONFIG_SYS_HAS_CPU_MIPS64_R2=y
+CONFIG_SYS_HAS_CPU_NEVADA=y
+CONFIG_SYS_HAS_CPU_RM7000=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR2=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_HARDWARE_WATCHPOINTS=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_BOARD_SCACHE=y
+CONFIG_MIPS_CPU_SCACHE=y
+CONFIG_CPU_HAS_PREFETCH=y
+# CONFIG_MIPS_MT_DISABLED is not set
+CONFIG_MIPS_MT_SMP=y
+# CONFIG_MIPS_MT_SMTC is not set
+CONFIG_MIPS_MT=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_SYS_SUPPORTS_SCHED_SMT=y
+CONFIG_SYS_SUPPORTS_MULTITHREADING=y
+CONFIG_MIPS_MT_FPAFF=y
+# CONFIG_MIPS_VPE_LOADER is not set
+# CONFIG_MIPS_CMP is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_CPU_HAS_SMARTMIPS is not set
+CONFIG_CPU_MIPSR2_IRQ_VI=y
+CONFIG_CPU_MIPSR2_IRQ_EI=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_SYS_SUPPORTS_SMARTMIPS=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+CONFIG_SMP=y
+CONFIG_SMP_UP=y
+CONFIG_SYS_SUPPORTS_MIPS_CMP=y
+CONFIG_SYS_SUPPORTS_SMP=y
+CONFIG_NR_CPUS_DEFAULT_2=y
+CONFIG_NR_CPUS=2
+# CONFIG_HZ_48 is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=100
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
+# CONFIG_USE_OF is not set
+CONFIG_BOOT_RAW=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_FHANDLE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_CGROUPS is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+CONFIG_CRASHLOG=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="/home/florian/dev/openwrt/trunk/build_dir/target-mipsel_r2_uClibc-0.9.33.2/root-malta"
+CONFIG_INITRAMFS_ROOT_UID=1000
+CONFIG_INITRAMFS_ROOT_GID=1000
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+# CONFIG_AIO is not set
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_FREEZER is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_MMU=y
+CONFIG_I8253=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Power management options
+#
+# CONFIG_PM_RUNTIME is not set
+CONFIG_MIPS_EXTERNAL_TIMER=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_PIMSM_V2 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+CONFIG_NF_CT_PROTO_GRE=m
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+CONFIG_NETFILTER_XT_TARGET_LED=m
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+
+#
+# Xtables matches
+#
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LAYER7=m
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+CONFIG_IP_NF_TARGET_ECN=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+CONFIG_IP6_NF_MATCH_RT=m
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_LANE is not set
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=y
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+# CONFIG_NET_SCH_ATM is not set
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_MULTIQ is not set
+CONFIG_NET_SCH_RED=m
+# CONFIG_NET_SCH_SFB is not set
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_INGRESS=m
+# CONFIG_NET_SCH_PLUG is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+# CONFIG_NET_ACT_GACT is not set
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_ACT_SKBEDIT=m
+# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_BQL=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+# CONFIG_CFG80211 is not set
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_ECC=m
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_IDS=m
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+
+#
+# Misc devices
+#
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=m
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE_XFER_MODE=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_PROC_FS is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=m
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_AEC62XX=m
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+CONFIG_BLK_DEV_IT821X=m
+# CONFIG_BLK_DEV_NS87415 is not set
+CONFIG_BLK_DEV_PDC202XX_OLD=m
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+CONFIG_BLK_DEV_IDEDMA=y
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_SATA_PMP is not set
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+# CONFIG_SATA_PROMISE is not set
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+CONFIG_SATA_VIA=m
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=m
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+CONFIG_DM_MIRROR=m
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=y
+CONFIG_IFB=m
+# CONFIG_NET_TEAM is not set
+CONFIG_MACVLAN=m
+# CONFIG_MACVTAP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+# CONFIG_TYPHOON is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+# CONFIG_ADAPTEC_STARFIRE is not set
+CONFIG_NET_VENDOR_ALTEON=y
+# CONFIG_ACENIC is not set
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+CONFIG_TIGON3=m
+# CONFIG_BNX2X is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_ENIC is not set
+CONFIG_DM9000=m
+CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+# CONFIG_DL2K is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_NET_VENDOR_EMULEX=y
+# CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_EXAR=y
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+CONFIG_NET_VENDOR_HP=y
+# CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+# CONFIG_E1000E is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+CONFIG_NET_VENDOR_I825XX=y
+# CONFIG_ZNET is not set
+# CONFIG_IP1000 is not set
+# CONFIG_JME is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+# CONFIG_SKGE_GENESIS is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+# CONFIG_MYRI10GE is not set
+# CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+# CONFIG_NS83820 is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_AX88796=m
+# CONFIG_AX88796_93CX6 is not set
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_PCH_GBE is not set
+# CONFIG_ETHOC is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_NETXEN_NIC is not set
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+# CONFIG_SEEQ8005 is not set
+CONFIG_NET_VENDOR_SILAN=y
+# CONFIG_SC92031 is not set
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+# CONFIG_SFC is not set
+CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_SMC91X is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+CONFIG_NET_VENDOR_STMICRO=y
+# CONFIG_STMMAC_ETH is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NIU is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+# CONFIG_TEHUTI is not set
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_TOSHIBA=y
+# CONFIG_TC35815 is not set
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PHYLIB=m
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_SWCONFIG=m
+# CONFIG_SWCONFIG_LEDS is not set
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM87XX_PHY is not set
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_MVSWITCH_PHY is not set
+CONFIG_IP17XX_PHY=m
+# CONFIG_AR8216_PHY is not set
+# CONFIG_RTL8306_PHY is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PSB6970_PHY is not set
+CONFIG_PPP=m
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_INT51X1 is not set
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+# CONFIG_USB_VL600 is not set
+CONFIG_WLAN=y
+CONFIG_AIRO=m
+# CONFIG_ATMEL is not set
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_WL_TI is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_VMXNET3 is not set
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+# CONFIG_ISDN_DRV_HISAX is not set
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+
+#
+# CAPI hardware drivers
+#
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_HYSDN is not set
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MISDN_NETJET is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_BMA150 is not set
+CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_POWERMATE is not set
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_CMA3000 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_SMBUS is not set
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_GENERIC_PWM=m
+CONFIG_GPIO_PWM=m
+CONFIG_W1=m
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+# CONFIG_W1_MASTER_DS1WM is not set
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2760=m
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_AVS is not set
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+CONFIG_SENSORS_ADT7475=m
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+CONFIG_SENSORS_LM85=m
+# CONFIG_SENSORS_LM87 is not set
+CONFIG_SENSORS_LM90=m
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+CONFIG_SENSORS_LM95241=m
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+CONFIG_SSB_SILENT=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_MIPS is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
+# CONFIG_BCMA_DRIVER_MIPS is not set
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+
+#
+# Media drivers
+#
+
+#
+# Graphics support
+#
+# CONFIG_VGA_ARB is not set
+# CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+CONFIG_SND_CS5535AUDIO=m
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=m
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_MIPS is not set
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_FIREWIRE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+# CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_XHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_CHIPIDEA is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_METRO is not set
+CONFIG_USB_SERIAL_MOS7720=m
+# CONFIG_USB_SERIAL_MOS7840 is not set
+CONFIG_USB_SERIAL_MOTOROLA=m
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+# CONFIG_USB_SERIAL_QCAUX is not set
+CONFIG_USB_SERIAL_QUALCOMM=m
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+# CONFIG_USB_SERIAL_SYMBOL is not set
+CONFIG_USB_SERIAL_TI=m
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=m
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_UWB is not set
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_WBSD is not set
+# CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_SPI=m
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+CONFIG_LEDS_TRIGGER_MORSE=m
+CONFIG_LEDS_TRIGGER_NETDEV=y
+CONFIG_LEDS_TRIGGER_USBDEV=m
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_DRV_PCF8563=m
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+CONFIG_RTC_DRV_PT7C4338=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+CONFIG_RTC_DRV_PCF2123=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# CONFIG_STAGING is not set
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_IOMMU_SUPPORT is not set
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_EXTCON is not set
+# CONFIG_MEMORY is not set
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+CONFIG_BTRFS_FS=m
+# CONFIG_BTRFS_FS_POSIX_ACL is not set
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_YAFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_LZMA=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_UBIFS_FS is not set
+# CONFIG_LOGFS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_XATTR is not set
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=y
+CONFIG_MINIX_FS=m
+CONFIG_MINIX_FS_NATIVE_ENDIAN=y
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_SWAP is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+CONFIG_NLS_CODEPAGE_866=m
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+CONFIG_NLS_ISO8859_13=m
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE 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
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_RUNTIME_DEBUG is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_SPINLOCK_TEST is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_RNG is not set
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_XZ is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+
+#
+# OCF Configuration
+#
+CONFIG_OCF_OCF=m
+CONFIG_OCF_RANDOMHARVEST=y
+CONFIG_OCF_FIPS=y
+CONFIG_OCF_CRYPTODEV=m
+CONFIG_OCF_CRYPTOSOFT=m
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_IXP4XX is not set
+CONFIG_OCF_HIFN=m
+CONFIG_OCF_HIFNHIPP=m
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+# CONFIG_DDR is not set
index 9b15c757213c075c41baf99f497fb5ab5b3dfb98..14c5b92082f3b4387b534294b4d47a1ab31b425f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/hso.c
 +++ b/drivers/net/usb/hso.c
 --- a/drivers/net/usb/hso.c
 +++ b/drivers/net/usb/hso.c
-@@ -476,8 +476,10 @@ static const struct usb_device_id hso_id
+@@ -468,8 +468,10 @@ static const struct usb_device_id hso_id
        {USB_DEVICE(0x0af0, 0x8400)},
        {USB_DEVICE(0x0af0, 0x8600)},
        {USB_DEVICE(0x0af0, 0x8800)},
        {USB_DEVICE(0x0af0, 0x8400)},
        {USB_DEVICE(0x0af0, 0x8600)},
        {USB_DEVICE(0x0af0, 0x8800)},
index 547e4faf73e33fe06106c254cec7acd93a6a27ac..7fe3069dff85d9cce59e454ab01d59129a2b3ab8 100644 (file)
@@ -44,11 +44,9 @@ To unsubscribe from this list: send the line "unsubscribe netdev" in
 the body of a message to majordomo@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
 the body of a message to majordomo@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 2fd2bc9..fa2c2c2 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -237,7 +237,11 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, const struct sk_buff *s
+@@ -237,7 +237,11 @@ static inline void TCP_ECN_check_ce(stru
                        tcp_enter_quickack_mode((struct sock *)tp);
                break;
        case INET_ECN_CE:
                        tcp_enter_quickack_mode((struct sock *)tp);
                break;
        case INET_ECN_CE:
index dcc1eaacff6afe2e9cb2de56cb5559336902ca5a..5ffeb0ed77f213c6a0baa3837b61ef3afd08ac63 100644 (file)
@@ -1,7 +1,6 @@
-diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/Locking vfs-3d5a648/Documentation/filesystems/Locking
---- vfs-4cbe5a5/Documentation/filesystems/Locking      2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/Documentation/filesystems/Locking      2012-09-05 16:35:20.000000000 +0200
-@@ -64,6 +64,7 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -64,6 +64,7 @@ prototypes:
        int (*atomic_open)(struct inode *, struct dentry *,
                                struct file *, unsigned open_flag,
                                umode_t create_mode, int *opened);
        int (*atomic_open)(struct inode *, struct dentry *,
                                struct file *, unsigned open_flag,
                                umode_t create_mode, int *opened);
@@ -9,7 +8,7 @@ diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/Locking vfs-3d5a648/Docu
  
  locking rules:
        all may block
  
  locking rules:
        all may block
-@@ -92,6 +93,7 @@
+@@ -92,6 +93,7 @@ removexattr: yes
  fiemap:               no
  update_time:  no
  atomic_open:  yes
  fiemap:               no
  update_time:  no
  atomic_open:  yes
@@ -17,9 +16,8 @@ diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/Locking vfs-3d5a648/Docu
  
        Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
  victim.
  
        Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
  victim.
-diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/overlayfs.txt vfs-3d5a648/Documentation/filesystems/overlayfs.txt
---- vfs-4cbe5a5/Documentation/filesystems/overlayfs.txt        1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/Documentation/filesystems/overlayfs.txt        2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
 @@ -0,0 +1,199 @@
 +Written by: Neil Brown <neilb@suse.de>
 +
 @@ -0,0 +1,199 @@
 +Written by: Neil Brown <neilb@suse.de>
 +
@@ -220,10 +218,9 @@ diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/overlayfs.txt vfs-3d5a64
 +filesystem are not allowed.  If the underlying filesystem is changed,
 +the behavior of the overlay is undefined, though it will not result in
 +a crash or deadlock.
 +filesystem are not allowed.  If the underlying filesystem is changed,
 +the behavior of the overlay is undefined, though it will not result in
 +a crash or deadlock.
-diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/vfs.txt vfs-3d5a648/Documentation/filesystems/vfs.txt
---- vfs-4cbe5a5/Documentation/filesystems/vfs.txt      2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/Documentation/filesystems/vfs.txt      2012-09-05 16:35:20.000000000 +0200
-@@ -363,6 +363,7 @@
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -363,6 +363,7 @@ struct inode_operations {
        int (*atomic_open)(struct inode *, struct dentry *,
                                struct file *, unsigned open_flag,
                                umode_t create_mode, int *opened);
        int (*atomic_open)(struct inode *, struct dentry *,
                                struct file *, unsigned open_flag,
                                umode_t create_mode, int *opened);
@@ -231,7 +228,7 @@ diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/vfs.txt vfs-3d5a648/Docu
  };
  
  Again, all methods are called without any locks being held, unless
  };
  
  Again, all methods are called without any locks being held, unless
-@@ -692,6 +693,12 @@
+@@ -692,6 +693,12 @@ struct address_space_operations {
        but instead uses bmap to find out where the blocks in the file
        are and uses those addresses directly.
  
        but instead uses bmap to find out where the blocks in the file
        are and uses those addresses directly.
  
@@ -244,10 +241,9 @@ diff -Nur -x .git vfs-4cbe5a5/Documentation/filesystems/vfs.txt vfs-3d5a648/Docu
  
    invalidatepage: If a page has PagePrivate set, then invalidatepage
          will be called when part or all of the page is to be removed
  
    invalidatepage: If a page has PagePrivate set, then invalidatepage
          will be called when part or all of the page is to be removed
-diff -Nur -x .git vfs-4cbe5a5/fs/ecryptfs/main.c vfs-3d5a648/fs/ecryptfs/main.c
---- vfs-4cbe5a5/fs/ecryptfs/main.c     2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/ecryptfs/main.c     2012-09-05 16:35:20.000000000 +0200
-@@ -565,6 +565,13 @@
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str
        s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
        s->s_blocksize = path.dentry->d_sb->s_blocksize;
        s->s_magic = ECRYPTFS_SUPER_MAGIC;
        s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
        s->s_blocksize = path.dentry->d_sb->s_blocksize;
        s->s_magic = ECRYPTFS_SUPER_MAGIC;
@@ -261,10 +257,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/ecryptfs/main.c vfs-3d5a648/fs/ecryptfs/main.c
  
        inode = ecryptfs_get_inode(path.dentry->d_inode, s);
        rc = PTR_ERR(inode);
  
        inode = ecryptfs_get_inode(path.dentry->d_inode, s);
        rc = PTR_ERR(inode);
-diff -Nur -x .git vfs-4cbe5a5/fs/internal.h vfs-3d5a648/fs/internal.h
---- vfs-4cbe5a5/fs/internal.h  2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/internal.h  2012-09-05 16:35:20.000000000 +0200
-@@ -42,11 +42,6 @@
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -42,11 +42,6 @@ static inline int __sync_blockdev(struct
  extern void __init chrdev_init(void);
  
  /*
  extern void __init chrdev_init(void);
  
  /*
@@ -276,10 +271,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/internal.h vfs-3d5a648/fs/internal.h
   * namespace.c
   */
  extern int copy_mount_options(const void __user *, unsigned long *);
   * namespace.c
   */
  extern int copy_mount_options(const void __user *, unsigned long *);
-diff -Nur -x .git vfs-4cbe5a5/fs/Kconfig vfs-3d5a648/fs/Kconfig
---- vfs-4cbe5a5/fs/Kconfig     2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/Kconfig     2012-09-05 16:35:20.000000000 +0200
-@@ -67,6 +67,7 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -67,6 +67,7 @@ source "fs/quota/Kconfig"
  
  source "fs/autofs4/Kconfig"
  source "fs/fuse/Kconfig"
  
  source "fs/autofs4/Kconfig"
  source "fs/fuse/Kconfig"
@@ -287,10 +281,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/Kconfig vfs-3d5a648/fs/Kconfig
  
  config CUSE
        tristate "Character device in Userspace support"
  
  config CUSE
        tristate "Character device in Userspace support"
-diff -Nur -x .git vfs-4cbe5a5/fs/Makefile vfs-3d5a648/fs/Makefile
---- vfs-4cbe5a5/fs/Makefile    2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/Makefile    2012-09-05 16:35:20.000000000 +0200
-@@ -106,6 +106,7 @@
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -106,6 +106,7 @@ obj-$(CONFIG_QNX6FS_FS)            += qnx6/
  obj-$(CONFIG_AUTOFS4_FS)      += autofs4/
  obj-$(CONFIG_ADFS_FS)         += adfs/
  obj-$(CONFIG_FUSE_FS)         += fuse/
  obj-$(CONFIG_AUTOFS4_FS)      += autofs4/
  obj-$(CONFIG_ADFS_FS)         += adfs/
  obj-$(CONFIG_FUSE_FS)         += fuse/
@@ -298,10 +291,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/Makefile vfs-3d5a648/fs/Makefile
  obj-$(CONFIG_UDF_FS)          += udf/
  obj-$(CONFIG_SUN_OPENPROMFS)  += openpromfs/
  obj-$(CONFIG_OMFS_FS)         += omfs/
  obj-$(CONFIG_UDF_FS)          += udf/
  obj-$(CONFIG_SUN_OPENPROMFS)  += openpromfs/
  obj-$(CONFIG_OMFS_FS)         += omfs/
-diff -Nur -x .git vfs-4cbe5a5/fs/namei.c vfs-3d5a648/fs/namei.c
---- vfs-4cbe5a5/fs/namei.c     2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/namei.c     2012-09-05 16:35:20.000000000 +0200
-@@ -348,6 +348,7 @@
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -348,6 +348,7 @@ int __inode_permission(struct inode *ino
  
        return security_inode_permission(inode, mask);
  }
  
        return security_inode_permission(inode, mask);
  }
@@ -309,7 +301,7 @@ diff -Nur -x .git vfs-4cbe5a5/fs/namei.c vfs-3d5a648/fs/namei.c
  
  /**
   * sb_permission - Check superblock-level permissions
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -2822,9 +2823,12 @@
+@@ -2822,9 +2823,12 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
@@ -325,10 +317,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/namei.c vfs-3d5a648/fs/namei.c
                if (error == -EOPENSTALE)
                        goto stale_open;
                goto out;
                if (error == -EOPENSTALE)
                        goto stale_open;
                goto out;
-diff -Nur -x .git vfs-4cbe5a5/fs/namespace.c vfs-3d5a648/fs/namespace.c
---- vfs-4cbe5a5/fs/namespace.c 2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/namespace.c 2012-09-05 16:35:20.000000000 +0200
-@@ -1387,6 +1387,24 @@
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1387,6 +1387,24 @@ void drop_collected_mounts(struct vfsmou
        release_mounts(&umount_list);
  }
  
        release_mounts(&umount_list);
  }
  
@@ -353,10 +344,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/namespace.c vfs-3d5a648/fs/namespace.c
  int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
                   struct vfsmount *root)
  {
  int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
                   struct vfsmount *root)
  {
-diff -Nur -x .git vfs-4cbe5a5/fs/open.c vfs-3d5a648/fs/open.c
---- vfs-4cbe5a5/fs/open.c      2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/open.c      2012-09-05 16:35:20.000000000 +0200
-@@ -787,8 +787,7 @@
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -787,8 +787,7 @@ struct file *dentry_open(const struct pa
                return ERR_PTR(error);
  
        f->f_flags = flags;
                return ERR_PTR(error);
  
        f->f_flags = flags;
@@ -366,7 +356,7 @@ diff -Nur -x .git vfs-4cbe5a5/fs/open.c vfs-3d5a648/fs/open.c
        if (!error) {
                error = open_check_o_direct(f);
                if (error) {
        if (!error) {
                error = open_check_o_direct(f);
                if (error) {
-@@ -803,6 +802,26 @@
+@@ -803,6 +802,26 @@ struct file *dentry_open(const struct pa
  }
  EXPORT_SYMBOL(dentry_open);
  
  }
  EXPORT_SYMBOL(dentry_open);
  
@@ -393,9 +383,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/open.c vfs-3d5a648/fs/open.c
  static void __put_unused_fd(struct files_struct *files, unsigned int fd)
  {
        struct fdtable *fdt = files_fdtable(files);
  static void __put_unused_fd(struct files_struct *files, unsigned int fd)
  {
        struct fdtable *fdt = files_fdtable(files);
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/copy_up.c vfs-3d5a648/fs/overlayfs/copy_up.c
---- vfs-4cbe5a5/fs/overlayfs/copy_up.c 1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/copy_up.c 2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
 @@ -0,0 +1,385 @@
 +/*
 + *
 @@ -0,0 +1,385 @@
 +/*
 + *
@@ -782,9 +771,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/copy_up.c vfs-3d5a648/fs/overlayfs/co
 +      dput(parent);
 +      return err;
 +}
 +      dput(parent);
 +      return err;
 +}
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/dir.c vfs-3d5a648/fs/overlayfs/dir.c
---- vfs-4cbe5a5/fs/overlayfs/dir.c     1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/dir.c     2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/dir.c
 @@ -0,0 +1,604 @@
 +/*
 + *
 @@ -0,0 +1,604 @@
 +/*
 + *
@@ -1390,9 +1378,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/dir.c vfs-3d5a648/fs/overlayfs/dir.c
 +      .listxattr      = ovl_listxattr,
 +      .removexattr    = ovl_removexattr,
 +};
 +      .listxattr      = ovl_listxattr,
 +      .removexattr    = ovl_removexattr,
 +};
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/inode.c vfs-3d5a648/fs/overlayfs/inode.c
---- vfs-4cbe5a5/fs/overlayfs/inode.c   1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/inode.c   2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/inode.c
 @@ -0,0 +1,372 @@
 +/*
 + *
 @@ -0,0 +1,372 @@
 +/*
 + *
@@ -1766,17 +1753,15 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/inode.c vfs-3d5a648/fs/overlayfs/inod
 +      return inode;
 +
 +}
 +      return inode;
 +
 +}
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/Kconfig vfs-3d5a648/fs/overlayfs/Kconfig
---- vfs-4cbe5a5/fs/overlayfs/Kconfig   1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/Kconfig   2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
 @@ -0,0 +1,4 @@
 +config OVERLAYFS_FS
 +      tristate "Overlay filesystem support"
 +      help
 +        Add support for overlay filesystem.
 @@ -0,0 +1,4 @@
 +config OVERLAYFS_FS
 +      tristate "Overlay filesystem support"
 +      help
 +        Add support for overlay filesystem.
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/Makefile vfs-3d5a648/fs/overlayfs/Makefile
---- vfs-4cbe5a5/fs/overlayfs/Makefile  1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/Makefile  2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/Makefile
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the overlay filesystem.
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the overlay filesystem.
@@ -1785,9 +1770,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/Makefile vfs-3d5a648/fs/overlayfs/Mak
 +obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
 +
 +overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
 +obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
 +
 +overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/overlayfs.h vfs-3d5a648/fs/overlayfs/overlayfs.h
---- vfs-4cbe5a5/fs/overlayfs/overlayfs.h       1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/overlayfs.h       2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
 @@ -0,0 +1,70 @@
 +/*
 + *
 @@ -0,0 +1,70 @@
 +/*
 + *
@@ -1859,9 +1843,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/overlayfs.h vfs-3d5a648/fs/overlayfs/
 +/* copy_up.c */
 +int ovl_copy_up(struct dentry *dentry);
 +int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
 +/* copy_up.c */
 +int ovl_copy_up(struct dentry *dentry);
 +int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/readdir.c vfs-3d5a648/fs/overlayfs/readdir.c
---- vfs-4cbe5a5/fs/overlayfs/readdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/readdir.c 2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
 @@ -0,0 +1,566 @@
 +/*
 + *
 @@ -0,0 +1,566 @@
 +/*
 + *
@@ -2429,9 +2412,8 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/readdir.c vfs-3d5a648/fs/overlayfs/re
 +
 +      return err;
 +}
 +
 +      return err;
 +}
-diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/super.c vfs-3d5a648/fs/overlayfs/super.c
---- vfs-4cbe5a5/fs/overlayfs/super.c   1970-01-01 01:00:00.000000000 +0100
-+++ vfs-3d5a648/fs/overlayfs/super.c   2012-09-05 16:35:20.000000000 +0200
+--- /dev/null
++++ b/fs/overlayfs/super.c
 @@ -0,0 +1,685 @@
 +/*
 + *
 @@ -0,0 +1,685 @@
 +/*
 + *
@@ -3118,10 +3100,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/overlayfs/super.c vfs-3d5a648/fs/overlayfs/supe
 +
 +module_init(ovl_init);
 +module_exit(ovl_exit);
 +
 +module_init(ovl_init);
 +module_exit(ovl_exit);
-diff -Nur -x .git vfs-4cbe5a5/fs/splice.c vfs-3d5a648/fs/splice.c
---- vfs-4cbe5a5/fs/splice.c    2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/fs/splice.c    2012-09-05 16:35:20.000000000 +0200
-@@ -1308,6 +1308,7 @@
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l
  
        return ret;
  }
  
        return ret;
  }
@@ -3129,10 +3110,9 @@ diff -Nur -x .git vfs-4cbe5a5/fs/splice.c vfs-3d5a648/fs/splice.c
  
  static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
                               struct pipe_inode_info *opipe,
  
  static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
                               struct pipe_inode_info *opipe,
-diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
---- vfs-4cbe5a5/include/linux/fs.h     2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/include/linux/fs.h     2012-09-05 16:35:20.000000000 +0200
-@@ -505,6 +505,12 @@
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -505,6 +505,12 @@ struct iattr {
   */
  #include <linux/quota.h>
  
   */
  #include <linux/quota.h>
  
@@ -3145,7 +3125,7 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
-@@ -1578,6 +1584,11 @@
+@@ -1578,6 +1584,11 @@ struct super_block {
  
        /* Being remounted read-only */
        int s_readonly_remount;
  
        /* Being remounted read-only */
        int s_readonly_remount;
@@ -3157,7 +3137,7 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
  };
  
  /* superblock cache pruning functions */
  };
  
  /* superblock cache pruning functions */
-@@ -1835,6 +1846,7 @@
+@@ -1835,6 +1846,7 @@ struct inode_operations {
        int (*atomic_open)(struct inode *, struct dentry *,
                           struct file *, unsigned open_flag,
                           umode_t create_mode, int *opened);
        int (*atomic_open)(struct inode *, struct dentry *,
                           struct file *, unsigned open_flag,
                           umode_t create_mode, int *opened);
@@ -3165,7 +3145,7 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
  } ____cacheline_aligned;
  
  struct seq_file;
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -2199,6 +2211,7 @@
+@@ -2199,6 +2211,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, umode_t);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
                                   const char *, int);
  extern struct file *filp_open(const char *, int, umode_t);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
                                   const char *, int);
@@ -3173,7 +3153,7 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
  extern struct file * dentry_open(const struct path *, int, const struct cred *);
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
  extern struct file * dentry_open(const struct path *, int, const struct cred *);
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
-@@ -2402,6 +2415,7 @@
+@@ -2402,6 +2415,7 @@ extern sector_t bmap(struct inode *, sec
  #endif
  extern int notify_change(struct dentry *, struct iattr *);
  extern int inode_permission(struct inode *, int);
  #endif
  extern int notify_change(struct dentry *, struct iattr *);
  extern int inode_permission(struct inode *, int);
@@ -3181,10 +3161,9 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/fs.h vfs-3d5a648/include/linux/fs.h
  extern int generic_permission(struct inode *, int);
  
  static inline bool execute_ok(struct inode *inode)
  extern int generic_permission(struct inode *, int);
  
  static inline bool execute_ok(struct inode *inode)
-diff -Nur -x .git vfs-4cbe5a5/include/linux/mount.h vfs-3d5a648/include/linux/mount.h
---- vfs-4cbe5a5/include/linux/mount.h  2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/include/linux/mount.h  2012-09-05 16:35:20.000000000 +0200
-@@ -66,6 +66,9 @@
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt
  extern void mnt_unpin(struct vfsmount *mnt);
  extern int __mnt_is_readonly(struct vfsmount *mnt);
  
  extern void mnt_unpin(struct vfsmount *mnt);
  extern int __mnt_is_readonly(struct vfsmount *mnt);
  
@@ -3194,10 +3173,9 @@ diff -Nur -x .git vfs-4cbe5a5/include/linux/mount.h vfs-3d5a648/include/linux/mo
  struct file_system_type;
  extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
                                      int flags, const char *name,
  struct file_system_type;
  extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
                                      int flags, const char *name,
-diff -Nur -x .git vfs-4cbe5a5/MAINTAINERS vfs-3d5a648/MAINTAINERS
---- vfs-4cbe5a5/MAINTAINERS    2012-09-01 19:39:58.000000000 +0200
-+++ vfs-3d5a648/MAINTAINERS    2012-09-05 16:35:20.000000000 +0200
-@@ -5103,6 +5103,13 @@
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -5105,6 +5105,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
index 400d2ed8e7cfc965e5c4c60f73143a0a5e848e4a..bf1815a2e1e6e35221c9d09017af5a3108e82981 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -795,7 +795,7 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -645,7 +645,7 @@ static int ehci_run (struct usb_hcd *hcd
                "USB %x.%x started, EHCI %x.%02x%s\n",
                ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
                temp >> 8, temp & 0xff,
                "USB %x.%x started, EHCI %x.%02x%s\n",
                ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
                temp >> 8, temp & 0xff,
@@ -11,7 +11,7 @@
                    &ehci->regs->intr_enable); /* Turn On Interrupts */
 --- a/drivers/usb/host/ehci-hub.c
 +++ b/drivers/usb/host/ehci-hub.c
                    &ehci->regs->intr_enable); /* Turn On Interrupts */
 --- a/drivers/usb/host/ehci-hub.c
 +++ b/drivers/usb/host/ehci-hub.c
-@@ -578,7 +578,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -585,7 +585,7 @@ ehci_hub_status_data (struct usb_hcd *hc
         * always set, seem to clear PORT_OCC and PORT_CSC when writing to
         * PORT_POWER; that's surprising, but maybe within-spec.
         */
         * always set, seem to clear PORT_OCC and PORT_CSC when writing to
         * PORT_POWER; that's surprising, but maybe within-spec.
         */
@@ -20,7 +20,7 @@
                mask = PORT_CSC | PORT_PEC | PORT_OCC;
        else
                mask = PORT_CSC | PORT_PEC;
                mask = PORT_CSC | PORT_PEC | PORT_OCC;
        else
                mask = PORT_CSC | PORT_PEC;
-@@ -803,7 +803,7 @@ static int ehci_hub_control (
+@@ -804,7 +804,7 @@ static int ehci_hub_control (
                if (temp & PORT_PEC)
                        status |= USB_PORT_STAT_C_ENABLE << 16;
  
                if (temp & PORT_PEC)
                        status |= USB_PORT_STAT_C_ENABLE << 16;
  
@@ -31,7 +31,7 @@
                        /*
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
                        /*
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
-@@ -147,6 +147,7 @@ struct ehci_hcd {                  /* one per controlle
+@@ -197,6 +197,7 @@ struct ehci_hcd {                  /* one per controlle
        unsigned                use_dummy_qh:1; /* AMD Frame List table quirk*/
        unsigned                has_synopsys_hc_bug:1; /* Synopsys HC */
        unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
        unsigned                use_dummy_qh:1; /* AMD Frame List table quirk*/
        unsigned                has_synopsys_hc_bug:1; /* Synopsys HC */
        unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
index 0d1bae8d455c92ffab1da33801dee2dff7eef5c1..6c16dd1b4b4496ea70edc271f8d071141037347e 100644 (file)
@@ -1,6 +1,6 @@
 --- a/scripts/setlocalversion
 +++ b/scripts/setlocalversion
 --- a/scripts/setlocalversion
 +++ b/scripts/setlocalversion
-@@ -168,7 +168,7 @@ else
+@@ -167,7 +167,7 @@ else
        # annotated or signed tagged state (as git describe only
        # looks at signed or annotated tags - git tag -a/-s) and
        # LOCALVERSION= is not specified
        # annotated or signed tagged state (as git describe only
        # looks at signed or annotated tags - git tag -a/-s) and
        # LOCALVERSION= is not specified
index 6fe8b0938d6051f11b005eedc80ee93391ff0d6e..ac26108459eec8f32e59a3206bbe8c5e5654e094 100644 (file)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile
-@@ -559,9 +559,9 @@ endif # $(dot-config)
+@@ -556,9 +556,9 @@ endif # $(dot-config)
  all: vmlinux
  
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
  all: vmlinux
  
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -12,7 +12,7 @@
  endif
  
  include $(srctree)/arch/$(SRCARCH)/Makefile
  endif
  
  include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -620,6 +620,9 @@ endif
+@@ -627,6 +627,9 @@ endif
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  
index bca1e356a0a1c1ff0b8911707138b6faecd5cec2..6cc81f58b5b2c3b36f1580664dbdcbcbb7cdb2fc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile
-@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
+@@ -369,7 +369,7 @@ KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
index 7fe248d8d333820172dba0c46fc5bfd11103169a..1a8e48276885ffbcfce43c525a868679dc9d2dc9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/stddef.h
 +++ b/include/linux/stddef.h
 --- a/include/linux/stddef.h
 +++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
+@@ -12,6 +12,7 @@ enum {
        false   = 0,
        true    = 1
  };
        false   = 0,
        true    = 1
  };
@@ -8,7 +8,7 @@
  
  #undef offsetof
  #ifdef __compiler_offsetof
  
  #undef offsetof
  #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
+@@ -19,6 +20,5 @@ enum {
  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif
  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif
index be6b6ff9d9906b5795c8768c7c35525b206df865..8acb18f83d836d47b22321722baa301c85222d10 100644 (file)
@@ -28,7 +28,7 @@
  #ifndef SYMBOL_PREFIX
  #define VMLINUX_SYMBOL(sym) sym
  #else
  #ifndef SYMBOL_PREFIX
  #define VMLINUX_SYMBOL(sym) sym
  #else
-@@ -275,14 +296,14 @@
+@@ -276,14 +297,14 @@
        /* Kernel symbol table: Normal symbols */                       \
        __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
                VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
        /* Kernel symbol table: Normal symbols */                       \
        __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
                VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
@@ -45,7 +45,7 @@
                VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;               \
        }                                                               \
                                                                        \
                VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;               \
        }                                                               \
                                                                        \
-@@ -344,7 +365,7 @@
+@@ -345,7 +366,7 @@
                                                                        \
        /* Kernel symbol table: strings */                              \
          __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
                                                                        \
        /* Kernel symbol table: strings */                              \
          __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {       \
@@ -54,7 +54,7 @@
        }                                                               \
                                                                        \
        /* __*init sections */                                          \
        }                                                               \
                                                                        \
        /* __*init sections */                                          \
-@@ -676,6 +697,9 @@
+@@ -670,6 +691,9 @@
        EXIT_TEXT                                                       \
        EXIT_DATA                                                       \
        EXIT_CALL                                                       \
        EXIT_TEXT                                                       \
        EXIT_DATA                                                       \
        EXIT_CALL                                                       \
index cbe3892316ae229a0b2a7cafb5a87276cd30b62c..f0c2275c0a4af07892ed6f7df4e2b5945058476a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -181,7 +181,6 @@ config NF_CONNTRACK_FTP
+@@ -191,7 +191,6 @@ config NF_CONNTRACK_FTP
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
@@ -8,7 +8,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -627,7 +626,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -693,7 +692,6 @@ config NETFILTER_XT_TARGET_SECMARK
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
index 53701458aac094e0e3a8480efb97ee26c97bea6b..fee28db120148eca948eda11ea7fed5dbf1265c3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -172,6 +172,7 @@ config CRYPTO_DEV_MV_CESA
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
        depends on PLAT_ORION
        select CRYPTO_ALGAPI
        select CRYPTO_AES
        depends on PLAT_ORION
        select CRYPTO_ALGAPI
        select CRYPTO_AES
index 1659fda937a1e591c8d8b61b765cff916d9cef35..690642d6a0bbd4557e8cfa483b661ff3cf6e09f5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -207,16 +207,16 @@ config BCH_CONST_T
+@@ -277,16 +277,16 @@ config BCH_CONST_T
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
index 8dde331a9d800e72f8454b58d139afa9b4a4ff20..0c4b92e24558bad2ffa5a9307adc8a24975abd36 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/wireless/Kconfig
 +++ b/net/wireless/Kconfig
 --- a/net/wireless/Kconfig
 +++ b/net/wireless/Kconfig
-@@ -143,13 +143,13 @@ config LIB80211
+@@ -150,13 +150,13 @@ config LIB80211
          you want this built into your kernel.
  
  config LIB80211_CRYPT_WEP
          you want this built into your kernel.
  
  config LIB80211_CRYPT_WEP
index b114ef404537e123bfdd31665839fb135a8996a5..e74803dff721b952edfe9f7aed08e8456304d3de 100644 (file)
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -877,9 +877,6 @@ config ARC
+@@ -894,9 +894,6 @@ config ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
  config CEVT_BCM1480
        bool
  
-@@ -2330,6 +2327,18 @@ config USE_OF
+@@ -2367,6 +2364,18 @@ config USE_OF
        help
          Include support for flattened device tree machine descriptions.
  
        help
          Include support for flattened device tree machine descriptions.
  
index 9193c68f0d4e6e3d1d266d32639813faab9c74cf..df09b5a7082803eb999e0ab21d4b8eddf8131f57 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -976,6 +976,10 @@ config SYNC_R4K
+@@ -993,6 +993,10 @@ config SYNC_R4K
  config MIPS_MACHINE
        def_bool n
  
  config MIPS_MACHINE
        def_bool n
  
index e747feac611f6a0312abd6166e550d19ddb54995..dab490ab4f2e14765999c1d91e57610f0ca902b1 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 --
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -961,6 +961,17 @@ config I8259
+@@ -978,6 +978,17 @@ config I8259
  config MIPS_BONITO64
        bool
  
  config MIPS_BONITO64
        bool
  
@@ -92,7 +92,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 +#endif /* CONFIG_MIPS_FPU_EMU */
 --- a/arch/mips/math-emu/dsemul.c
 +++ b/arch/mips/math-emu/dsemul.c
 +#endif /* CONFIG_MIPS_FPU_EMU */
 --- a/arch/mips/math-emu/dsemul.c
 +++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
+@@ -108,6 +108,7 @@ int mips_dsemul(struct pt_regs *regs, mi
        return SIGILL;          /* force out of emulation loop */
  }
  
        return SIGILL;          /* force out of emulation loop */
  }
  
@@ -100,7 +100,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  int do_dsemulret(struct pt_regs *xcp)
  {
        struct emuframe __user *fr;
  int do_dsemulret(struct pt_regs *xcp)
  {
        struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
+@@ -164,3 +165,9 @@ int do_dsemulret(struct pt_regs *xcp)
  
        return 1;
  }
  
        return 1;
  }
index 2dcbf951fb583a4ea27ae2374b04b9b6f875ccec..fea4a0012939973df964686c46aa883fea0b716e 100644 (file)
@@ -13,7 +13,7 @@
  
 --- a/arch/mips/include/asm/module.h
 +++ b/arch/mips/include/asm/module.h
  
 --- a/arch/mips/include/asm/module.h
 +++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
        const struct exception_table_entry *dbe_start;
        const struct exception_table_entry *dbe_end;
        struct mips_hi16 *r_mips_hi16_list;
        const struct exception_table_entry *dbe_start;
        const struct exception_table_entry *dbe_end;
        struct mips_hi16 *r_mips_hi16_list;
@@ -27,7 +27,7 @@
  typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
 --- a/arch/mips/kernel/module.c
 +++ b/arch/mips/kernel/module.c
  typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
 --- a/arch/mips/kernel/module.c
 +++ b/arch/mips/kernel/module.c
-@@ -44,14 +44,219 @@ static struct mips_hi16 *mips_hi16_list;
+@@ -42,14 +42,219 @@ struct mips_hi16 {
  static LIST_HEAD(dbe_list);
  static DEFINE_SPINLOCK(dbe_lock);
  
  static LIST_HEAD(dbe_list);
  static DEFINE_SPINLOCK(dbe_lock);
  
  
  static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
  {
  
  static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
  {
-@@ -72,28 +277,36 @@ static int apply_r_mips_32_rela(struct m
+@@ -70,28 +275,36 @@ static int apply_r_mips_32_rela(struct m
        return 0;
  }
  
        return 0;
  }
  
  {
        if (v % 4) {
                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
  {
        if (v % 4) {
                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -102,17 +315,31 @@ static int apply_r_mips_26_rela(struct m
+@@ -100,17 +313,31 @@ static int apply_r_mips_26_rela(struct m
        }
  
        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
        }
  
        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
  static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
  {
        struct mips_hi16 *n;
  static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
  {
        struct mips_hi16 *n;
-@@ -380,11 +607,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+@@ -405,11 +632,32 @@ int module_finalize(const Elf_Ehdr *hdr,
                list_add(&me->arch.dbe_list, &dbe_list);
                spin_unlock_irq(&dbe_lock);
        }
                list_add(&me->arch.dbe_list, &dbe_list);
                spin_unlock_irq(&dbe_lock);
        }
index f83c96bb81f64a65764dc81705927b24c3933353..bed5786454f4f1384739f93c6ad3d16e1d58d939 100644 (file)
@@ -1,7 +1,7 @@
 --- a/arch/mips/oprofile/op_model_mipsxx.c
 +++ b/arch/mips/oprofile/op_model_mipsxx.c
 --- a/arch/mips/oprofile/op_model_mipsxx.c
 +++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
-       }
+@@ -303,6 +303,11 @@ static irqreturn_t mipsxx_perfcount_int(
+       return mipsxx_perfcount_handler();
  }
  
 +static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
  }
  
 +static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
@@ -12,9 +12,9 @@
  static int __init mipsxx_init(void)
  {
        int counters;
  static int __init mipsxx_init(void)
  {
        int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
-       save_perf_irq = perf_irq;
-       perf_irq = mipsxx_perfcount_handler;
+@@ -385,6 +390,10 @@ static int __init mipsxx_init(void)
+               return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
+                       0, "Perfcounter", save_perf_irq);
  
 +      if (cp0_perfcount_irq >= 0)
 +              return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
  
 +      if (cp0_perfcount_irq >= 0)
 +              return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
@@ -23,9 +23,9 @@
        return 0;
  }
  
        return 0;
  }
  
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
-       int counters = op_model_mipsxx_ops.num_counters;
+@@ -395,6 +404,9 @@ static void mipsxx_exit(void)
+       if ((cp0_perfcount_irq >= 0) && (cp0_compare_irq != cp0_perfcount_irq))
+               free_irq(cp0_perfcount_irq, save_perf_irq);
  
 +      if (cp0_perfcount_irq >= 0)
 +              free_irq(cp0_perfcount_irq, save_perf_irq);
  
 +      if (cp0_perfcount_irq >= 0)
 +              free_irq(cp0_perfcount_irq, save_perf_irq);
index ac6304a2b5aeb4dc66628baa303e1b8c336a9348..7d16726f0902efde109929e6452ee45cb234902f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/kernel/cpu-probe.c
 +++ b/arch/mips/kernel/cpu-probe.c
 --- a/arch/mips/kernel/cpu-probe.c
 +++ b/arch/mips/kernel/cpu-probe.c
-@@ -816,10 +816,13 @@ static inline void cpu_probe_mips(struct
+@@ -833,10 +833,13 @@ static inline void cpu_probe_mips(struct
                __cpu_name[cpu] = "MIPS 20Kc";
                break;
        case PRID_IMP_24K:
                __cpu_name[cpu] = "MIPS 20Kc";
                break;
        case PRID_IMP_24K:
index 3f67f1b6cb54e19b060bb64da6a8097ad9947f4e..885f347d95aae79227444802de8aacf3baa65053 100644 (file)
@@ -3,7 +3,7 @@ they still want to support gcc 3.3 -- well, we don't.
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -130,7 +130,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+@@ -119,7 +119,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
  KBUILD_CFLAGS         += -mno-sched-epilog
  endif
  
  KBUILD_CFLAGS         += -mno-sched-epilog
  endif
  
index 941aa909de00e3f44cdcec04d58ef1b56bf10bef..fe5d7c576eab1f7cc8b984e43cb808c727f3a57b 100644 (file)
@@ -1,10 +1,10 @@
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -94,7 +94,6 @@ else
- endif
- endif
+@@ -86,7 +86,6 @@ CPP          = $(CC) -E $(KBUILD_CFLAGS)
+ CHECKFLAGS    += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
  
 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  
  
 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  
- ifeq ($(CONFIG_TUNE_CELL),y)
      KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
+ # No AltiVec or VSX instructions when building kernel
KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
index 7a79c4144c9a8dd20432e8fda00a9a4d227a276c..e94ef650a68951f24e67aaaca73b0e5d3e2c64e7 100644 (file)
@@ -437,7 +437,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
  
  #include <asm/addrspace.h>
  #include <asm/bootinfo.h>
  
  #include <asm/addrspace.h>
  #include <asm/bootinfo.h>
-@@ -523,12 +524,62 @@ static void __init arch_mem_init(char **
+@@ -522,12 +523,62 @@ static void __init arch_mem_init(char **
        }
  
        bootmem_init();
        }
  
        bootmem_init();
@@ -500,7 +500,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
  static void __init resource_init(void)
  {
        int i;
  static void __init resource_init(void)
  {
        int i;
-@@ -544,6 +595,8 @@ static void __init resource_init(void)
+@@ -543,6 +594,8 @@ static void __init resource_init(void)
        /*
         * Request address space for all standard RAM.
         */
        /*
         * Request address space for all standard RAM.
         */
@@ -509,7 +509,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
        for (i = 0; i < boot_mem_map.nr_map; i++) {
                struct resource *res;
                unsigned long start, end;
        for (i = 0; i < boot_mem_map.nr_map; i++) {
                struct resource *res;
                unsigned long start, end;
-@@ -580,6 +633,7 @@ static void __init resource_init(void)
+@@ -579,6 +632,7 @@ static void __init resource_init(void)
                 */
                request_resource(res, &code_resource);
                request_resource(res, &data_resource);
                 */
                request_resource(res, &code_resource);
                request_resource(res, &data_resource);
@@ -519,7 +519,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
  
 --- a/arch/mips/kernel/smp.c
 +++ b/arch/mips/kernel/smp.c
  
 --- a/arch/mips/kernel/smp.c
 +++ b/arch/mips/kernel/smp.c
-@@ -433,3 +433,21 @@ void flush_tlb_one(unsigned long vaddr)
+@@ -386,3 +386,21 @@ void flush_tlb_one(unsigned long vaddr)
  
  EXPORT_SYMBOL(flush_tlb_page);
  EXPORT_SYMBOL(flush_tlb_one);
  
  EXPORT_SYMBOL(flush_tlb_page);
  EXPORT_SYMBOL(flush_tlb_one);
index 5ffc2e29bdbdafbea5bab39b7cef3ef7a18aad2a..c98fc24a4731a3ba42226bcd76c46f376368b072 100644 (file)
@@ -146,7 +146,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
 -      .size           relocate_new_kernel_size, PTRSIZE
 --- a/arch/mips/kernel/vmlinux.lds.S
 +++ b/arch/mips/kernel/vmlinux.lds.S
 -      .size           relocate_new_kernel_size, PTRSIZE
 --- a/arch/mips/kernel/vmlinux.lds.S
 +++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -50,6 +50,10 @@ SECTIONS
+@@ -51,6 +51,10 @@ SECTIONS
                *(.text.*)
                *(.fixup)
                *(.gnu.warning)
                *(.text.*)
                *(.fixup)
                *(.gnu.warning)
index 549df5a6673163a4048dcbb3720f8586585d0dfe..ea9ee53c4a12c78721f498db111ccd292a223fb4 100644 (file)
@@ -1,6 +1,6 @@
 --- a/kernel/module.c
 +++ b/kernel/module.c
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -2322,12 +2322,15 @@ static void dynamic_debug_remove(struct
+@@ -2353,12 +2353,15 @@ static void dynamic_debug_remove(struct
  
  void * __weak module_alloc(unsigned long size)
  {
  
  void * __weak module_alloc(unsigned long size)
  {
index 6dc433bd564c91c479a8ff24cc5703f7ca8f465b..976f56002df1c832eaa68f530b61721762f43706 100644 (file)
   */
  #define PART(x)  ((struct mtd_part *)(x))
 -
   */
  #define PART(x)  ((struct mtd_part *)(x))
 -
-+#define IS_PART(mtd) (mtd->read == part_read)
++#define IS_PART(mtd) (mtd->_read == part_read)
  
  /*
   * MTD methods which simply translate the effective address and pass through
  
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -643,6 +645,155 @@ int mtd_del_partition(struct mtd_info *m
+@@ -613,6 +615,155 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -55,7 +55,7 @@
 +      struct squashfs_super_block sb;
 +      int len, ret;
 +
 +      struct squashfs_super_block sb;
 +      int len, ret;
 +
-+      ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
++      ret = master->_read(master, offset, sizeof(sb), &len, (void *) &sb);
 +      if (ret || (len != sizeof(sb))) {
 +              printk(KERN_ALERT "split_squashfs: error occured while reading "
 +                      "from \"%s\"\n", master->name);
 +      if (ret || (len != sizeof(sb))) {
 +              printk(KERN_ALERT "split_squashfs: error occured while reading "
 +                      "from \"%s\"\n", master->name);
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -659,6 +810,9 @@ int add_mtd_partitions(struct mtd_info *
+@@ -629,6 +780,9 @@ int add_mtd_partitions(struct mtd_info *
        struct mtd_part *slave;
        uint64_t cur_offset = 0;
        int i;
        struct mtd_part *slave;
        uint64_t cur_offset = 0;
        int i;
  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  
  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  
-@@ -673,12 +827,53 @@ int add_mtd_partitions(struct mtd_info *
+@@ -643,12 +797,53 @@ int add_mtd_partitions(struct mtd_info *
  
                add_mtd_device(&slave->mtd);
  
  
                add_mtd_device(&slave->mtd);
  
  
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
  
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
-@@ -1005,6 +1005,12 @@ static int mtdchar_ioctl(struct file *fi
+@@ -1012,6 +1012,12 @@ static int mtdchar_ioctl(struct file *fi
                break;
        }
  
                break;
        }
  
  struct mtd_info {
        u_char type;
        uint32_t flags;
  struct mtd_info {
        u_char type;
        uint32_t flags;
-@@ -214,6 +215,9 @@ struct mtd_info {
+@@ -226,6 +227,9 @@ struct mtd_info {
        int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs);
        int (*_suspend) (struct mtd_info *mtd);
        void (*_resume) (struct mtd_info *mtd);
        int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs);
        int (*_suspend) (struct mtd_info *mtd);
        void (*_resume) (struct mtd_info *mtd);
        /*
         * If the driver is something smart, like UBI, it may need to maintain
         * its own reference counting. The below functions are only for driver.
        /*
         * If the driver is something smart, like UBI, it may need to maintain
         * its own reference counting. The below functions are only for driver.
-@@ -502,6 +506,7 @@ extern int mtd_device_parse_register(str
+@@ -375,6 +379,7 @@ extern int mtd_device_parse_register(str
                              int defnr_parts);
  #define mtd_device_register(master, parts, nr_parts)  \
        mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
                              int defnr_parts);
  #define mtd_device_register(master, parts, nr_parts)  \
        mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
index 24b93448c7e103908d090710caab96242d6de354..f2fa3676fbf552fe6ab00758bb872adf31ce3adf 100644 (file)
@@ -9,7 +9,7 @@
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);
  static DEFINE_MUTEX(mtd_partitions_mutex);
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);
  static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -252,13 +254,60 @@ static int part_erase(struct mtd_info *m
+@@ -230,13 +232,60 @@ static int part_erase(struct mtd_info *m
        struct mtd_part *part = PART(mtd);
        int ret;
  
        struct mtd_part *part = PART(mtd);
        int ret;
  
        return ret;
  }
  
        return ret;
  }
  
-@@ -266,7 +315,25 @@ void mtd_erase_callback(struct erase_inf
+@@ -244,7 +293,25 @@ void mtd_erase_callback(struct erase_inf
  {
  {
-       if (instr->mtd->erase == part_erase) {
+       if (instr->mtd->_erase == part_erase) {
                struct mtd_part *part = PART(instr->mtd);
 +              size_t wrlen = 0;
  
 +              if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
 +                      if (instr->partial_start) {
                struct mtd_part *part = PART(instr->mtd);
 +              size_t wrlen = 0;
  
 +              if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
 +                      if (instr->partial_start) {
-+                              part->master->write(part->master,
++                              part->master->_write(part->master,
 +                                      instr->addr, instr->erase_buf_ofs,
 +                                      &wrlen, instr->erase_buf);
 +                              instr->addr += instr->erase_buf_ofs;
 +                      } else {
 +                              instr->len -= instr->erase_buf_ofs;
 +                                      instr->addr, instr->erase_buf_ofs,
 +                                      &wrlen, instr->erase_buf);
 +                              instr->addr += instr->erase_buf_ofs;
 +                      } else {
 +                              instr->len -= instr->erase_buf_ofs;
-+                              part->master->write(part->master,
++                              part->master->_write(part->master,
 +                                      instr->addr + instr->len,
 +                                      instr->erase_buf_ofs, &wrlen,
 +                                      instr->erase_buf +
 +                                      instr->addr + instr->len,
 +                                      instr->erase_buf_ofs, &wrlen,
 +                                      instr->erase_buf +
@@ -96,7 +96,7 @@
                if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
                        instr->fail_addr -= part->offset;
                instr->addr -= part->offset;
                if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
                        instr->fail_addr -= part->offset;
                instr->addr -= part->offset;
-@@ -537,18 +604,24 @@ static struct mtd_part *allocate_partiti
+@@ -504,18 +571,24 @@ static struct mtd_part *allocate_partiti
        if ((slave->mtd.flags & MTD_WRITEABLE) &&
            mtd_mod_by_eb(slave->offset, &slave->mtd)) {
                /* Doesn't start on a boundary of major erase size */
        if ((slave->mtd.flags & MTD_WRITEABLE) &&
            mtd_mod_by_eb(slave->offset, &slave->mtd)) {
                /* Doesn't start on a boundary of major erase size */
 +                              part->name);
  
        slave->mtd.ecclayout = master->ecclayout;
 +                              part->name);
  
        slave->mtd.ecclayout = master->ecclayout;
-       if (master->block_isbad) {
+       slave->mtd.ecc_strength = master->ecc_strength;
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
 @@ -58,6 +58,10 @@ struct erase_info {
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
 @@ -58,6 +58,10 @@ struct erase_info {
index fb6700b07efed031675c89bd6126ac47bbf4dcda..f74affcef70ea00effa3ecee9a73c9a2caed2cc0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c
-@@ -267,14 +267,21 @@ static int parse_redboot_partitions(stru
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
  #endif
                names += strlen(names)+1;
  
  #endif
                names += strlen(names)+1;
  
index db8377b303897270b6bdfb9e6dc3c7e946d9aade..4191b0d42613557fec63d7f5a79e6707876193bb 100644 (file)
@@ -17,7 +17,7 @@
        int nrparts = 0;
        struct fis_image_desc *buf;
        struct mtd_partition *parts;
        int nrparts = 0;
        struct fis_image_desc *buf;
        struct mtd_partition *parts;
-@@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru
+@@ -225,14 +228,14 @@ static int parse_redboot_partitions(stru
                }
        }
  #endif
                }
        }
  #endif
@@ -34,7 +34,7 @@
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        if (nulllen > 0) {
                strcpy(nullname, nullstring);
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        if (nulllen > 0) {
                strcpy(nullname, nullstring);
-@@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru
+@@ -251,6 +254,8 @@ static int parse_redboot_partitions(stru
        }
  #endif
        for ( ; i<nrparts; i++) {
        }
  #endif
        for ( ; i<nrparts; i++) {
@@ -43,7 +43,7 @@
                parts[i].size = fl->img->size;
                parts[i].offset = fl->img->flash_base;
                parts[i].name = names;
                parts[i].size = fl->img->size;
                parts[i].offset = fl->img->flash_base;
                parts[i].name = names;
-@@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru
+@@ -284,6 +289,14 @@ static int parse_redboot_partitions(stru
                fl = fl->next;
                kfree(tmp_fl);
        }
                fl = fl->next;
                kfree(tmp_fl);
        }
index 00208c8700f68733259e513bb0cf597ce7a0860c..d87b59b565a139127e42f4933bd8bf3407856577 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/slab.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/slab.h>
-@@ -231,11 +232,12 @@ static void block2mtd_free_device(struct
+@@ -208,11 +209,12 @@ static void block2mtd_free_device(struct
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -22,7 +22,7 @@
        char *name;
  
        if (!devname)
        char *name;
  
        if (!devname)
-@@ -274,13 +276,16 @@ static struct block2mtd_dev *add_device(
+@@ -251,13 +253,16 @@ static struct block2mtd_dev *add_device(
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
@@ -41,7 +41,7 @@
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.writebufsize = PAGE_SIZE;
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.writebufsize = PAGE_SIZE;
-@@ -294,14 +299,17 @@ static struct block2mtd_dev *add_device(
+@@ -270,14 +275,17 @@ static struct block2mtd_dev *add_device(
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
  
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
  
@@ -62,7 +62,7 @@
        return dev;
  
  devinit_err:
        return dev;
  
  devinit_err:
-@@ -374,9 +382,9 @@ static char block2mtd_paramline[80 + 12]
+@@ -350,9 +358,9 @@ static char block2mtd_paramline[80 + 12]
  
  static int block2mtd_setup2(const char *val)
  {
  
  static int block2mtd_setup2(const char *val)
  {
@@ -74,7 +74,7 @@
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
-@@ -387,7 +395,7 @@ static int block2mtd_setup2(const char *
+@@ -363,7 +371,7 @@ static int block2mtd_setup2(const char *
        strcpy(str, val);
        kill_final_newline(str);
  
        strcpy(str, val);
        kill_final_newline(str);
  
@@ -83,7 +83,7 @@
                token[i] = strsep(&str, ",");
  
        if (str)
                token[i] = strsep(&str, ",");
  
        if (str)
-@@ -406,8 +414,10 @@ static int block2mtd_setup2(const char *
+@@ -382,8 +390,10 @@ static int block2mtd_setup2(const char *
                        parse_err("illegal erase size");
                }
        }
                        parse_err("illegal erase size");
                }
        }
@@ -95,7 +95,7 @@
  
        return 0;
  }
  
        return 0;
  }
-@@ -441,7 +451,7 @@ static int block2mtd_setup(const char *v
+@@ -417,7 +427,7 @@ static int block2mtd_setup(const char *v
  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  {
 --- a/block/partition-generic.c
 +++ b/block/partition-generic.c
  {
 --- a/block/partition-generic.c
 +++ b/block/partition-generic.c
-@@ -546,6 +546,7 @@ int invalidate_partitions(struct gendisk
+@@ -548,6 +548,7 @@ int invalidate_partitions(struct gendisk
  
        return 0;
  }
  
        return 0;
  }
index bbaddf7de17ec0d602db2de8e728b1599e687d72..d54e52900e4e01343fed6e4565fa026f5624e225 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@
+@@ -29,6 +29,8 @@ struct block2mtd_dev {
        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;
        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;
@@ -9,7 +9,7 @@
  };
  
  
  };
  
  
-@@ -79,6 +81,12 @@
+@@ -79,6 +81,12 @@ static int block2mtd_erase(struct mtd_in
        size_t len = instr->len;
        int err;
  
        size_t len = instr->len;
        int err;
  
@@ -22,7 +22,7 @@
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);
-@@ -90,6 +98,10 @@
+@@ -90,6 +98,10 @@ static int block2mtd_erase(struct mtd_in
                instr->state = MTD_ERASE_DONE;
  
        mtd_erase_callback(instr);
                instr->state = MTD_ERASE_DONE;
  
        mtd_erase_callback(instr);
@@ -33,7 +33,7 @@
        return err;
  }
  
        return err;
  }
  
-@@ -101,7 +113,13 @@
+@@ -101,7 +113,13 @@ static int block2mtd_read(struct mtd_inf
        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);
        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);
@@ -48,7 +48,7 @@
  
        while (len) {
                if ((offset + len) > PAGE_SIZE)
  
        while (len) {
                if ((offset + len) > PAGE_SIZE)
-@@ -111,8 +129,10 @@
+@@ -111,8 +129,10 @@ static int block2mtd_read(struct mtd_inf
                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@@ -60,7 +60,7 @@
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);
-@@ -123,7 +143,10 @@
+@@ -123,7 +143,10 @@ static int block2mtd_read(struct mtd_inf
                offset = 0;
                index++;
        }
                offset = 0;
                index++;
        }
@@ -72,7 +72,7 @@
  }
  
  
  }
  
  
-@@ -171,13 +194,22 @@
+@@ -171,13 +194,22 @@ static int block2mtd_write(struct mtd_in
                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;
                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;
@@ -96,7 +96,7 @@
        return err;
  }
  
        return err;
  }
  
-@@ -186,33 +218,110 @@
+@@ -186,33 +218,110 @@ static int block2mtd_write(struct mtd_in
  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;
  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;
        struct block2mtd_dev *dev;
        struct mtd_partition *part;
        char *name;
        struct block2mtd_dev *dev;
        struct mtd_partition *part;
        char *name;
-@@ -220,36 +329,17 @@
+@@ -220,36 +329,17 @@ static struct block2mtd_dev *add_device(
        if (!devname)
                return NULL;
  
        if (!devname)
                return NULL;
  
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
-@@ -274,6 +364,7 @@
+@@ -274,6 +364,7 @@ static struct block2mtd_dev *add_device(
        dev->mtd._read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
        dev->mtd._read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
index c427e9fd01bf26b763ced0f24c069d8448e04447..3287486119680b88ae78820b943515421b040b5c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
+@@ -241,6 +241,7 @@ static int _open_bdev(struct block2mtd_d
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
index fd2b9b57b90fd32efe907b2a062d887309f6750b..5c6b02827adf705852bb1154e2e1c39d3962b396 100644 (file)
@@ -15,7 +15,7 @@
  /* Keep gcc happy */
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c
  /* Keep gcc happy */
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c
-@@ -93,7 +93,18 @@ static int __devinit plat_nand_probe(str
+@@ -98,7 +98,18 @@ static int __devinit plat_nand_probe(str
        }
  
        /* Scan to find existence of the device */
        }
  
        /* Scan to find existence of the device */
index 0c4b9bea0e0bde9b4e591c987d0d46916c3b2a0b..0cdec9ede22e12215a6322db7effc81c9461876c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -682,7 +682,7 @@ static int get_chip(struct map_info *map
+@@ -700,7 +700,7 @@ static int get_chip(struct map_info *map
                return 0;
  
        case FL_ERASING:
                return 0;
  
        case FL_ERASING:
index ff27d04f8fc962d942bc6d64452ce7314714bbf3..76989506aa854f4b2249dde868bca9d289bc370f 100644 (file)
@@ -8,7 +8,7 @@
  #define       OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
  #define       OPCODE_RDID             0x9f    /* Read JEDEC ID */
  
  #define       OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
  #define       OPCODE_RDID             0x9f    /* Read JEDEC ID */
  
-@@ -625,6 +626,7 @@ struct flash_info {
+@@ -594,6 +595,7 @@ struct flash_info {
        u16             flags;
  #define       SECT_4K         0x01            /* OPCODE_BE_4K works uniformly */
  #define       M25P_NO_ERASE   0x02            /* No erase command needed */
        u16             flags;
  #define       SECT_4K         0x01            /* OPCODE_BE_4K works uniformly */
  #define       M25P_NO_ERASE   0x02            /* No erase command needed */
@@ -16,7 +16,7 @@
  };
  
  #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)    \
  };
  
  #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)    \
-@@ -686,6 +688,10 @@ static const struct spi_device_id m25p_i
+@@ -659,6 +661,10 @@ static const struct spi_device_id m25p_i
        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
        { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
  
        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
        { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
  
@@ -27,7 +27,7 @@
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
         */
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
         */
-@@ -921,6 +927,9 @@ static int __devinit m25p_probe(struct s
+@@ -895,6 +901,9 @@ static int __devinit m25p_probe(struct s
        if (info->flags & SECT_4K) {
                flash->erase_opcode = OPCODE_BE_4K;
                flash->mtd.erasesize = 4096;
        if (info->flags & SECT_4K) {
                flash->erase_opcode = OPCODE_BE_4K;
                flash->mtd.erasesize = 4096;
index 290f4f6b8b6673f93155eff07a6c8360bb88a1b0..d731d1279a6a33627db184a555628e6632297d81 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -765,6 +765,7 @@ static const struct spi_device_id m25p_i
+@@ -739,6 +739,7 @@ static const struct spi_device_id m25p_i
        { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
        { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
        { "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
        { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
        { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
        { "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
index 3b43535da505e489ca0f4589d6c380a5cdf29a65..b2ed53aa9c85c1a08866a0eea52741417fe3867a 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  1 file changed, 1 insertion(+)
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
  1 file changed, 1 insertion(+)
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1409,6 +1409,7 @@ static int __xipram do_write_buffer(stru
+@@ -1413,6 +1413,7 @@ static int __xipram do_write_buffer(stru
  
        /* Write Buffer Load */
        map_write(map, CMD(0x25), cmd_adr);
  
        /* Write Buffer Load */
        map_write(map, CMD(0x25), cmd_adr);
index 231d4548c7d6ce569562e46eda6194140ae0534e..270586ea747b910570428b49b0a8f8be7dc0de1f 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
-@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ
+@@ -110,6 +110,14 @@ config MTD_SPEAR_SMI
        help
        help
-         This option enables FAST_READ access supported by ST M25Pxx.
+         This enable SNOR support on SPEAR platforms using SMI controller
  
 +config M25PXX_PREFER_SMALL_SECTOR_ERASE
 +      bool "Prefer small sector erase"
  
 +config M25PXX_PREFER_SMALL_SECTOR_ERASE
 +      bool "Prefer small sector erase"
@@ -30,8 +30,8 @@
  /****************************************************************************/
  
  struct m25p {
  /****************************************************************************/
  
  struct m25p {
-@@ -925,7 +931,7 @@ static int __devinit m25p_probe(struct s
-               flash->mtd.write = m25p80_write;
+@@ -899,7 +905,7 @@ static int __devinit m25p_probe(struct s
+               flash->mtd._write = m25p80_write;
  
        /* prefer "small sector" erase if possible */
 -      if (info->flags & SECT_4K) {
  
        /* prefer "small sector" erase if possible */
 -      if (info->flags & SECT_4K) {
index 439cbde1637299c3d73b6000619ae199b7324ae7..1bba91953f0df5ed12a2bc3e88fe119cde6e4a7b 100644 (file)
@@ -1,10 +1,10 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -677,6 +677,7 @@ static const struct spi_device_id m25p_i
+@@ -646,6 +646,7 @@ static const struct spi_device_id m25p_i
        { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
        { "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
        { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
 +      { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
  
        { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
        { "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
        { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
 +      { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
  
-       /* Intel/Numonyx -- xxxs33b */
-       { "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
+       /* Everspin */
+       { "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
index d60a428f0947d2d26f3c831b7898c53c1d2c45da..0fc4154fa6279d74625d729d7c0f06898c149f2e 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -356,7 +356,14 @@ static int part_unlock(struct mtd_info *
+@@ -330,7 +330,14 @@ static int part_lock(struct mtd_info *mt
  static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
  {
        struct mtd_part *part = PART(mtd);
  static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
  {
        struct mtd_part *part = PART(mtd);
index 7776dcfb90d1665870cde4bb8f1f3bdb6fc4b0bc..9efe3ecc6c32d344e4c7d348a1524b2fed5c1252 100644 (file)
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -35,6 +35,7 @@ source "fs/gfs2/Kconfig"
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
  source "fs/ocfs2/Kconfig"
  source "fs/btrfs/Kconfig"
  source "fs/nilfs2/Kconfig"
  source "fs/ocfs2/Kconfig"
  source "fs/btrfs/Kconfig"
  source "fs/nilfs2/Kconfig"
@@ -10,7 +10,7 @@
  
 --- a/fs/Makefile
 +++ b/fs/Makefile
  
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -125,3 +125,5 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
+@@ -126,3 +126,5 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-y                         += exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)         += ceph/
  obj-$(CONFIG_PSTORE)          += pstore/
  obj-y                         += exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)         += ceph/
  obj-$(CONFIG_PSTORE)          += pstore/
index f4535a6b5188f42bd4ec2eb125205a1d235cdca1..3d705056e4e2bd8eb6ac3f552f90dd8268d8ec0d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -35,7 +35,6 @@ source "fs/gfs2/Kconfig"
+@@ -39,7 +39,6 @@ source "fs/gfs2/Kconfig"
  source "fs/ocfs2/Kconfig"
  source "fs/btrfs/Kconfig"
  source "fs/nilfs2/Kconfig"
  source "fs/ocfs2/Kconfig"
  source "fs/btrfs/Kconfig"
  source "fs/nilfs2/Kconfig"
@@ -8,7 +8,7 @@
  
  endif # BLOCK
  
  
  endif # BLOCK
  
-@@ -201,6 +200,10 @@ source "fs/hfsplus/Kconfig"
+@@ -205,6 +204,10 @@ source "fs/hfsplus/Kconfig"
  source "fs/befs/Kconfig"
  source "fs/bfs/Kconfig"
  source "fs/efs/Kconfig"
  source "fs/befs/Kconfig"
  source "fs/bfs/Kconfig"
  source "fs/efs/Kconfig"
@@ -21,7 +21,7 @@
  source "fs/ubifs/Kconfig"
 --- a/fs/Makefile
 +++ b/fs/Makefile
  source "fs/ubifs/Kconfig"
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -125,5 +125,6 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
+@@ -126,5 +126,6 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-y                         += exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)         += ceph/
  obj-$(CONFIG_PSTORE)          += pstore/
  obj-y                         += exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)         += ceph/
  obj-$(CONFIG_PSTORE)          += pstore/
index 2d4c3fc6e32de81b4bde211e78e1c6e8a6e0a0da..4a0fd0bead39fe3373993ebffd27c34302698d0b 100644 (file)
@@ -28,7 +28,7 @@
 +CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
 --- a/fs/jffs2/compr.c
 +++ b/fs/jffs2/compr.c
 +CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
 --- a/fs/jffs2/compr.c
 +++ b/fs/jffs2/compr.c
-@@ -374,6 +374,9 @@ int __init jffs2_compressors_init(void)
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
  #ifdef CONFIG_JFFS2_LZO
        jffs2_lzo_init();
  #endif
  #ifdef CONFIG_JFFS2_LZO
        jffs2_lzo_init();
  #endif
@@ -38,7 +38,7 @@
  /* Setting default compression mode */
  #ifdef CONFIG_JFFS2_CMODE_NONE
        jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
  /* Setting default compression mode */
  #ifdef CONFIG_JFFS2_CMODE_NONE
        jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -397,6 +400,9 @@ int __init jffs2_compressors_init(void)
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
  int jffs2_compressors_exit(void)
  {
  /* Unregistering compressors */
  int jffs2_compressors_exit(void)
  {
  /* Unregistering compressors */
 +}
 --- a/fs/jffs2/super.c
 +++ b/fs/jffs2/super.c
 +}
 --- a/fs/jffs2/super.c
 +++ b/fs/jffs2/super.c
-@@ -371,14 +371,41 @@ static int __init init_jffs2_fs(void)
+@@ -373,14 +373,41 @@ static int __init init_jffs2_fs(void)
        BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
        BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
  
        BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
        BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
  
 +#endif
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
 +#endif
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
+@@ -188,6 +188,12 @@ config LZO_DECOMPRESS
  
  source "lib/xz/Kconfig"
  
  
  source "lib/xz/Kconfig"
  
index c0afcd281d80b69630e9b42bd571f8c54618e853..f36131e99fcfde6f2f2101f229e44ee5306ac376 100644 (file)
@@ -1,13 +1,12 @@
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
-@@ -112,6 +112,17 @@ static int jffs2_build_filesystem(struct
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  
 +      if (c->flags & (1 << 7)) {
 +              printk("%s(): unlocking the mtd device... ", __func__);
        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  
 +      if (c->flags & (1 << 7)) {
 +              printk("%s(): unlocking the mtd device... ", __func__);
-+              if (c->mtd->unlock)
-+                      c->mtd->unlock(c->mtd, 0, c->mtd->size);
++              mtd_unlock(c->mtd, 0, c->mtd->size);
 +              printk("done.\n");
 +
 +              printk("%s(): erasing all blocks after the end marker... ", __func__);
 +              printk("done.\n");
 +
 +              printk("%s(): erasing all blocks after the end marker... ", __func__);
@@ -20,7 +19,7 @@
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c
-@@ -147,8 +147,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
+@@ -148,8 +148,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  
@@ -34,7 +33,7 @@
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;
-@@ -549,6 +552,17 @@ static int jffs2_scan_eraseblock (struct
+@@ -556,6 +559,17 @@ static int jffs2_scan_eraseblock (struct
                        return err;
        }
  
                        return err;
        }
  
index 3b37007305f6451fc09df29e1b712d2e52b979fc..c43f166a8b9a94fbc0d3ce5a94d13436a0cf2bed 100644 (file)
@@ -1,6 +1,6 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -924,6 +924,13 @@ config CRYPTO_LZO
+@@ -1008,6 +1008,13 @@ config CRYPTO_LZO
        help
          This is the LZO algorithm.
  
        help
          This is the LZO algorithm.
  
index 212670f4ecb2f24d6e1648cd41d3e853b30e52e6..e69c7f1d015decf9da8cecfe85b70c4484e76998 100644 (file)
@@ -1,6 +1,6 @@
 --- a/fs/ubifs/Kconfig
 +++ b/fs/ubifs/Kconfig
 --- a/fs/ubifs/Kconfig
 +++ b/fs/ubifs/Kconfig
-@@ -5,8 +5,10 @@
+@@ -5,8 +5,10 @@ config UBIFS_FS
        select CRYPTO if UBIFS_FS_ADVANCED_COMPR
        select CRYPTO if UBIFS_FS_LZO
        select CRYPTO if UBIFS_FS_ZLIB
        select CRYPTO if UBIFS_FS_ADVANCED_COMPR
        select CRYPTO if UBIFS_FS_LZO
        select CRYPTO if UBIFS_FS_ZLIB
@@ -11,7 +11,7 @@
        depends on MTD_UBI
        help
          UBIFS is a file system for flash devices which works on top of UBI.
        depends on MTD_UBI
        help
          UBIFS is a file system for flash devices which works on top of UBI.
-@@ -35,3 +37,12 @@
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
        default y
        help
          Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
        default y
        help
          Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
index b0d818e8df5dd788e4217116c8e5ffeab40cb5da..3d4936318689bb06b7ea46350156e6af37bc5b77 100644 (file)
@@ -1,6 +1,6 @@
 --- a/fs/ubifs/file.c
 +++ b/fs/ubifs/file.c
 --- a/fs/ubifs/file.c
 +++ b/fs/ubifs/file.c
-@@ -1575,6 +1575,12 @@ const struct inode_operations ubifs_syml
+@@ -1573,6 +1573,12 @@ const struct inode_operations ubifs_syml
        .follow_link = ubifs_follow_link,
        .setattr     = ubifs_setattr,
        .getattr     = ubifs_getattr,
        .follow_link = ubifs_follow_link,
        .setattr     = ubifs_setattr,
        .getattr     = ubifs_getattr,
index f3055590abb6d8fd2528c1ae31dec5a25009433b..c1d9f681eddf2d85fedab91aaafaf2a24d15d8f8 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -1053,6 +1053,27 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1119,6 +1119,27 @@ config NETFILTER_XT_MATCH_STATE
  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  
@@ -30,7 +30,7 @@
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -105,6 +105,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -214,6 +214,14 @@ destroy_conntrack(struct nf_conntrack *n
+@@ -215,6 +215,14 @@ destroy_conntrack(struct nf_conntrack *n
         * too. */
        nf_ct_remove_expectations(ct);
  
         * too. */
        nf_ct_remove_expectations(ct);
  
  
 --- a/include/net/netfilter/nf_conntrack.h
 +++ b/include/net/netfilter/nf_conntrack.h
  
 --- a/include/net/netfilter/nf_conntrack.h
 +++ b/include/net/netfilter/nf_conntrack.h
-@@ -134,6 +134,22 @@ struct nf_conn {
+@@ -105,6 +105,22 @@ struct nf_conn {
        struct net *ct_net;
  #endif
  
        struct net *ct_net;
  #endif
  
 +#endif /* _XT_LAYER7_H */
 --- a/include/linux/netfilter/Kbuild
 +++ b/include/linux/netfilter/Kbuild
 +#endif /* _XT_LAYER7_H */
 --- a/include/linux/netfilter/Kbuild
 +++ b/include/linux/netfilter/Kbuild
-@@ -49,6 +49,7 @@ header-y += xt_hashlimit.h
+@@ -52,6 +52,7 @@ header-y += xt_hashlimit.h
  header-y += xt_helper.h
  header-y += xt_iprange.h
  header-y += xt_ipvs.h
  header-y += xt_helper.h
  header-y += xt_iprange.h
  header-y += xt_ipvs.h
index 92a7200602fae711a680d5d253f0d3c97824ef88..49767fb52293437ac36265dc1719c168d3891569 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -857,6 +857,27 @@ config NETFILTER_XT_MATCH_IPVS
+@@ -923,6 +923,27 @@ config NETFILTER_XT_MATCH_IPVS
  
          If unsure, say N.
  
  
          If unsure, say N.
  
@@ -28,7 +28,7 @@
  config NETFILTER_XT_MATCH_LENGTH
        tristate '"length" match support'
        depends on NETFILTER_ADVANCED
  config NETFILTER_XT_MATCH_LENGTH
        tristate '"length" match support'
        depends on NETFILTER_ADVANCED
-@@ -1053,26 +1074,11 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1119,26 +1140,11 @@ config NETFILTER_XT_MATCH_STATE
  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  
index 662a499d179fd7b6e48327cce13fedc67f17bfb6..be40370f54acb636aef537371aba416180a5ebfe 100644 (file)
@@ -1,8 +1,8 @@
 --- a/include/linux/netfilter/nf_conntrack_sip.h
 +++ b/include/linux/netfilter/nf_conntrack_sip.h
 --- a/include/linux/netfilter/nf_conntrack_sip.h
 +++ b/include/linux/netfilter/nf_conntrack_sip.h
-@@ -2,12 +2,15 @@
- #define __NF_CONNTRACK_SIP_H__
- #ifdef __KERNEL__
+@@ -4,12 +4,15 @@
+ #include <net/netfilter/nf_conntrack_expect.h>
  
 +#include <linux/types.h>
 +
  
 +#include <linux/types.h>
 +
  enum sip_expectation_classes {
 --- a/net/ipv4/netfilter/nf_nat_sip.c
 +++ b/net/ipv4/netfilter/nf_nat_sip.c
  enum sip_expectation_classes {
 --- a/net/ipv4/netfilter/nf_nat_sip.c
 +++ b/net/ipv4/netfilter/nf_nat_sip.c
-@@ -73,6 +73,7 @@ static int map_addr(struct sk_buff *skb,
+@@ -73,11 +73,14 @@ static int map_addr(struct sk_buff *skb,
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
-+      struct nf_conn_help *help = nfct_help(ct);
++      struct nf_ct_sip_master *ct_sip_info;
        char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
        unsigned int buflen;
        __be32 newaddr;
        char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
        unsigned int buflen;
        __be32 newaddr;
-@@ -85,7 +86,8 @@ static int map_addr(struct sk_buff *skb,
+       __be16 newport;
++      ct_sip_info = nfct_help_data(ct->master);
++
+       if (ct->tuplehash[dir].tuple.src.u3.ip == addr->ip &&
+           ct->tuplehash[dir].tuple.src.u.udp.port == port) {
+               newaddr = ct->tuplehash[!dir].tuple.dst.u3.ip;
+@@ -85,7 +88,8 @@ static int map_addr(struct sk_buff *skb,
        } else if (ct->tuplehash[dir].tuple.dst.u3.ip == addr->ip &&
                   ct->tuplehash[dir].tuple.dst.u.udp.port == port) {
                newaddr = ct->tuplehash[!dir].tuple.src.u3.ip;
 -              newport = ct->tuplehash[!dir].tuple.src.u.udp.port;
        } else if (ct->tuplehash[dir].tuple.dst.u3.ip == addr->ip &&
                   ct->tuplehash[dir].tuple.dst.u.udp.port == port) {
                newaddr = ct->tuplehash[!dir].tuple.src.u3.ip;
 -              newport = ct->tuplehash[!dir].tuple.src.u.udp.port;
-+              newport = help->help.ct_sip_info.forced_dport ? :
++              newport = ct_sip_info->forced_dport ? :
 +                        ct->tuplehash[!dir].tuple.src.u.udp.port;
        } else
                return 1;
  
 +                        ct->tuplehash[!dir].tuple.src.u.udp.port;
        } else
                return 1;
  
-@@ -121,6 +123,7 @@ static unsigned int ip_nat_sip(struct sk
+@@ -121,6 +125,7 @@ static unsigned int ip_nat_sip(struct sk
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
        unsigned int coff, matchoff, matchlen;
        enum sip_header_types hdr;
        union nf_inet_addr addr;
        unsigned int coff, matchoff, matchlen;
        enum sip_header_types hdr;
        union nf_inet_addr addr;
-@@ -229,6 +232,20 @@ next:
+@@ -230,6 +235,22 @@ next:
            !map_sip_addr(skb, dataoff, dptr, datalen, SIP_HDR_TO))
                return NF_DROP;
  
            !map_sip_addr(skb, dataoff, dptr, datalen, SIP_HDR_TO))
                return NF_DROP;
  
++      struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct->master);
++
 +      /* Mangle destination port for Cisco phones, then fix up checksums */
 +      /* Mangle destination port for Cisco phones, then fix up checksums */
-+      if (dir == IP_CT_DIR_REPLY && help->help.ct_sip_info.forced_dport) {
++      if (dir == IP_CT_DIR_REPLY && ct_sip_info->forced_dport) {
 +              struct udphdr *uh;
 +
 +              if (!skb_make_writable(skb, skb->len))
 +                      return NF_DROP;
 +
 +              uh = (struct udphdr *)(skb->data + ip_hdrlen(skb));
 +              struct udphdr *uh;
 +
 +              if (!skb_make_writable(skb, skb->len))
 +                      return NF_DROP;
 +
 +              uh = (struct udphdr *)(skb->data + ip_hdrlen(skb));
-+              uh->dest = help->help.ct_sip_info.forced_dport;
++              uh->dest = ct_sip_info->forced_dport;
 +
 +              if (!nf_nat_mangle_udp_packet(skb, ct, ctinfo, 0, 0, NULL, 0))
 +                      return NF_DROP;
 +
 +              if (!nf_nat_mangle_udp_packet(skb, ct, ctinfo, 0, 0, NULL, 0))
 +                      return NF_DROP;
@@ -65,7 +74,7 @@
        return NF_ACCEPT;
  }
  
        return NF_ACCEPT;
  }
  
-@@ -280,8 +297,10 @@ static unsigned int ip_nat_sip_expect(st
+@@ -281,10 +302,13 @@ static unsigned int ip_nat_sip_expect(st
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
        u_int16_t port;
 +      __be16 srcport;
        char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
        u_int16_t port;
 +      __be16 srcport;
        char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
-       unsigned buflen;
+       unsigned int buflen;
++      struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct->master);
  
  
-@@ -294,8 +313,9 @@ static unsigned int ip_nat_sip_expect(st
+       /* Connection will come from reply */
+       if (ct->tuplehash[dir].tuple.src.u3.ip == ct->tuplehash[!dir].tuple.dst.u3.ip)
+@@ -295,8 +319,9 @@ static unsigned int ip_nat_sip_expect(st
        /* If the signalling port matches the connection's source port in the
         * original direction, try to use the destination port in the opposite
         * direction. */
 -      if (exp->tuple.dst.u.udp.port ==
 -          ct->tuplehash[dir].tuple.src.u.udp.port)
        /* If the signalling port matches the connection's source port in the
         * original direction, try to use the destination port in the opposite
         * direction. */
 -      if (exp->tuple.dst.u.udp.port ==
 -          ct->tuplehash[dir].tuple.src.u.udp.port)
-+      srcport = help->help.ct_sip_info.forced_dport ? :
++      srcport = ct_sip_info->forced_dport ? :
 +                ct->tuplehash[dir].tuple.src.u.udp.port;
 +      if (exp->tuple.dst.u.udp.port == srcport)
                port = ntohs(ct->tuplehash[!dir].tuple.dst.u.udp.port);
 +                ct->tuplehash[dir].tuple.src.u.udp.port;
 +      if (exp->tuple.dst.u.udp.port == srcport)
                port = ntohs(ct->tuplehash[!dir].tuple.dst.u.udp.port);
                port = ntohs(exp->tuple.dst.u.udp.port);
 --- a/net/netfilter/nf_conntrack_sip.c
 +++ b/net/netfilter/nf_conntrack_sip.c
                port = ntohs(exp->tuple.dst.u.udp.port);
 --- a/net/netfilter/nf_conntrack_sip.c
 +++ b/net/netfilter/nf_conntrack_sip.c
-@@ -1363,8 +1363,25 @@ static int process_sip_request(struct sk
+@@ -1416,8 +1416,26 @@ static int process_sip_request(struct sk
  {
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
  {
        enum ip_conntrack_info ctinfo;
        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
        unsigned int cseq, i;
 +      union nf_inet_addr addr;
 +      __be16 port;
        unsigned int cseq, i;
 +      union nf_inet_addr addr;
 +      __be16 port;
++      struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct->master);
 +
 +      /* Many Cisco IP phones use a high source port for SIP requests, but
 +       * listen for the response on port 5060.  If we are the local
 +
 +      /* Many Cisco IP phones use a high source port for SIP requests, but
 +       * listen for the response on port 5060.  If we are the local
 +                                  &matchlen, &addr, &port) > 0 &&
 +          port != ct->tuplehash[dir].tuple.src.u.udp.port &&
 +          nf_inet_addr_cmp(&addr, &ct->tuplehash[dir].tuple.src.u3))
 +                                  &matchlen, &addr, &port) > 0 &&
 +          port != ct->tuplehash[dir].tuple.src.u.udp.port &&
 +          nf_inet_addr_cmp(&addr, &ct->tuplehash[dir].tuple.src.u3))
-+              help->help.ct_sip_info.forced_dport = port;
++              ct_sip_info->forced_dport = port;
  
        for (i = 0; i < ARRAY_SIZE(sip_handlers); i++) {
                const struct sip_handler *handler;
  
        for (i = 0; i < ARRAY_SIZE(sip_handlers); i++) {
                const struct sip_handler *handler;
index 51c9e0999ba1b718e39b9e99726f12f2e1943859..003df8bb17ecd71a7fce1cbfba0a976c4ee9aecb 100644 (file)
@@ -50,7 +50,7 @@
  static bool
  ip_checkentry(const struct ipt_ip *ip)
  {
  static bool
  ip_checkentry(const struct ipt_ip *ip)
  {
-@@ -561,7 +587,7 @@ static void cleanup_match(struct xt_entr
+@@ -560,7 +586,7 @@ static void cleanup_match(struct xt_entr
  }
  
  static int
  }
  
  static int
@@ -59,7 +59,7 @@
  {
        const struct xt_entry_target *t;
  
  {
        const struct xt_entry_target *t;
  
-@@ -570,6 +596,8 @@ check_entry(const struct ipt_entry *e, c
+@@ -569,6 +595,8 @@ check_entry(const struct ipt_entry *e, c
                return -EINVAL;
        }
  
                return -EINVAL;
        }
  
@@ -68,7 +68,7 @@
        if (e->target_offset + sizeof(struct xt_entry_target) >
            e->next_offset)
                return -EINVAL;
        if (e->target_offset + sizeof(struct xt_entry_target) >
            e->next_offset)
                return -EINVAL;
-@@ -931,6 +959,7 @@ copy_entries_to_user(unsigned int total_
+@@ -930,6 +958,7 @@ copy_entries_to_user(unsigned int total_
        const struct xt_table_info *private = table->private;
        int ret = 0;
        const void *loc_cpu_entry;
        const struct xt_table_info *private = table->private;
        int ret = 0;
        const void *loc_cpu_entry;
@@ -76,7 +76,7 @@
  
        counters = alloc_counters(table);
        if (IS_ERR(counters))
  
        counters = alloc_counters(table);
        if (IS_ERR(counters))
-@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
+@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
                        ret = -EFAULT;
                        goto free_counters;
                }
                        ret = -EFAULT;
                        goto free_counters;
                }
index 3cf0e5a32d9f21a5e5d38da41e5d70e09e918f95..10f9250bb2641da14509a6bc8341cb560b609880 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/ipv4/netfilter/ip_tables.c
 +++ b/net/ipv4/netfilter/ip_tables.c
 --- a/net/ipv4/netfilter/ip_tables.c
 +++ b/net/ipv4/netfilter/ip_tables.c
-@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+@@ -309,6 +309,33 @@ struct ipt_entry *ipt_next_entry(const s
        return (void *)entry + entry->next_offset;
  }
  
        return (void *)entry + entry->next_offset;
  }
  
@@ -34,7 +34,7 @@
  /* Returns one of the generic firewall policies, like NF_ACCEPT. */
  unsigned int
  ipt_do_table(struct sk_buff *skb,
  /* Returns one of the generic firewall policies, like NF_ACCEPT. */
  unsigned int
  ipt_do_table(struct sk_buff *skb,
-@@ -334,6 +361,25 @@ ipt_do_table(struct sk_buff *skb,
+@@ -333,6 +360,25 @@ ipt_do_table(struct sk_buff *skb,
        ip = ip_hdr(skb);
        indev = in ? in->name : nulldevname;
        outdev = out ? out->name : nulldevname;
        ip = ip_hdr(skb);
        indev = in ? in->name : nulldevname;
        outdev = out ? out->name : nulldevname;
@@ -60,7 +60,7 @@
        /* We handle fragments by dealing with the first fragment as
         * if it was a normal packet.  All other fragments are treated
         * normally, except that they will NEVER match rules that ask
        /* We handle fragments by dealing with the first fragment as
         * if it was a normal packet.  All other fragments are treated
         * normally, except that they will NEVER match rules that ask
-@@ -348,18 +394,6 @@ ipt_do_table(struct sk_buff *skb,
+@@ -347,18 +393,6 @@ ipt_do_table(struct sk_buff *skb,
        acpar.family  = NFPROTO_IPV4;
        acpar.hooknum = hook;
  
        acpar.family  = NFPROTO_IPV4;
        acpar.hooknum = hook;
  
index 1c259d4f0c5b5c1c6d0da2a53ae31677b0047183..a1e46effee8ce81ffd8f4badd4369522e14bf3b9 100644 (file)
@@ -10,7 +10,7 @@
  /* "Be conservative in what you do,
      be liberal in what you accept from others."
      If it's non-zero, we mark only out of window RST segments as INVALID. */
  /* "Be conservative in what you do,
      be liberal in what you accept from others."
      If it's non-zero, we mark only out of window RST segments as INVALID. */
-@@ -524,6 +527,9 @@ static bool tcp_in_window(const struct n
+@@ -526,6 +529,9 @@ static bool tcp_in_window(const struct n
        s16 receiver_offset;
        bool res;
  
        s16 receiver_offset;
        bool res;
  
@@ -20,7 +20,7 @@
        /*
         * Get the required data from the packet.
         */
        /*
         * Get the required data from the packet.
         */
-@@ -1321,6 +1327,13 @@ static struct ctl_table tcp_sysctl_table
+@@ -1425,6 +1431,13 @@ static struct ctl_table tcp_sysctl_table
                .proc_handler   = proc_dointvec,
        },
        {
                .proc_handler   = proc_dointvec,
        },
        {
@@ -32,5 +32,5 @@
 +      },
 +      {
                .procname       = "nf_conntrack_tcp_be_liberal",
 +      },
 +      {
                .procname       = "nf_conntrack_tcp_be_liberal",
-               .data           = &nf_ct_tcp_be_liberal,
                .maxlen         = sizeof(unsigned int),
                .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
index 1fdf09d0991a5a57163672388e816d590a39e1b8..a21bf1e45d632f27e4008dbe344c1f125556ae10 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/pkt_sched.h
 +++ b/include/linux/pkt_sched.h
 --- a/include/linux/pkt_sched.h
 +++ b/include/linux/pkt_sched.h
-@@ -193,6 +193,33 @@ struct tc_sfq_xstats {
+@@ -214,6 +214,33 @@ struct tc_sfq_xstats {
        __s32           allot;
  };
  
        __s32           allot;
  };
  
 +
 +#include <linux/module.h>
 +#include <asm/uaccess.h>
 +
 +#include <linux/module.h>
 +#include <asm/uaccess.h>
-+#include <asm/system.h>
 +#include <linux/bitops.h>
 +#include <linux/types.h>
 +#include <linux/kernel.h>
 +#include <linux/bitops.h>
 +#include <linux/types.h>
 +#include <linux/kernel.h>
 +      opt.flows = q->depth;
 +      opt.hash_kind = q->hash_kind;
 +
 +      opt.flows = q->depth;
 +      opt.hash_kind = q->hash_kind;
 +
-+      NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
++      if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++              goto nla_put_failure;
 +
 +      return skb->len;
 +
 +
 +      return skb->len;
 +
index b6adce1febd0979cbdad8b022ee9b5dbfb92a765..0393f1589331e4e3844113291beb855b7b6fe0f1 100644 (file)
 +module_exit(connmark_cleanup_module);
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
 +module_exit(connmark_cleanup_module);
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
-@@ -624,6 +624,19 @@ config NET_ACT_CSUM
+@@ -670,6 +670,19 @@ config NET_ACT_CSUM
          To compile this code as a module, choose M here: the
          module will be called act_csum.
  
          To compile this code as a module, choose M here: the
          module will be called act_csum.
  
index 231b745c6a10a2686f2a518d7d357e532c76ae18..a630d1d8231391570c6083369fe6577d722751fc 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #define PACKET_FANOUT_LB              1
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
  #define PACKET_FANOUT_LB              1
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
-@@ -296,6 +296,7 @@ struct packet_sock {
+@@ -295,6 +295,7 @@ struct packet_sock {
        unsigned int            tp_loss:1;
        unsigned int            tp_tstamp;
        struct packet_type      prot_hook ____cacheline_aligned_in_smp;
        unsigned int            tp_loss:1;
        unsigned int            tp_tstamp;
        struct packet_type      prot_hook ____cacheline_aligned_in_smp;
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  };
  
  #define PACKET_FANOUT_MAX     256
  };
  
  #define PACKET_FANOUT_MAX     256
-@@ -1383,6 +1384,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1384,6 +1385,7 @@ static int packet_rcv_spkt(struct sk_buf
  {
        struct sock *sk;
        struct sockaddr_pkt *spkt;
  {
        struct sock *sk;
        struct sockaddr_pkt *spkt;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        /*
         *      When we registered the protocol we saved the socket in the data
  
        /*
         *      When we registered the protocol we saved the socket in the data
-@@ -1390,6 +1392,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1391,6 +1393,7 @@ static int packet_rcv_spkt(struct sk_buf
         */
  
        sk = pt->af_packet_priv;
         */
  
        sk = pt->af_packet_priv;
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        /*
         *      Yank back the headers [hope the device set this
  
        /*
         *      Yank back the headers [hope the device set this
-@@ -1402,7 +1405,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1403,7 +1406,7 @@ static int packet_rcv_spkt(struct sk_buf
         *      so that this procedure is noop.
         */
  
         *      so that this procedure is noop.
         */
  
@@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
                goto out;
  
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto out;
  
        if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -1596,12 +1599,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -1609,12 +1612,12 @@ static int packet_rcv(struct sk_buff *sk
        int skb_len = skb->len;
        unsigned int snaplen, res;
  
        int skb_len = skb->len;
        unsigned int snaplen, res;
  
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -1720,12 +1723,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -1733,12 +1736,12 @@ static int tpacket_rcv(struct sk_buff *s
        struct timespec ts;
        struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
  
        struct timespec ts;
        struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
  
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -2595,6 +2598,7 @@ static int packet_create(struct net *net
+@@ -2619,6 +2622,7 @@ static int packet_create(struct net *net
        spin_lock_init(&po->bind_lock);
        mutex_init(&po->pg_vec_lock);
        po->prot_hook.func = packet_rcv;
        spin_lock_init(&po->bind_lock);
        mutex_init(&po->pg_vec_lock);
        po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
-@@ -3192,6 +3196,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3216,6 +3220,16 @@ packet_setsockopt(struct socket *sock, i
  
                return fanout_add(sk, val & 0xffff, val >> 16);
        }
  
                return fanout_add(sk, val & 0xffff, val >> 16);
        }
@@ -116,9 +116,9 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        default:
                return -ENOPROTOOPT;
        }
        default:
                return -ENOPROTOOPT;
        }
-@@ -3262,6 +3276,13 @@ static int packet_getsockopt(struct sock
-               data = &val;
+@@ -3270,6 +3284,13 @@ static int packet_getsockopt(struct sock
+       case PACKET_VNET_HDR:
+               val = po->has_vnet_hdr;
                break;
 +      case PACKET_RECV_TYPE:
 +              if (len > sizeof(unsigned int))
                break;
 +      case PACKET_RECV_TYPE:
 +              if (len > sizeof(unsigned int))
@@ -128,5 +128,5 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +              data = &val;
 +              break;
        case PACKET_VERSION:
 +              data = &val;
 +              break;
        case PACKET_VERSION:
-               if (len > sizeof(int))
-                       len = sizeof(int);
+               val = po->tp_version;
+               break;
index 68434bfc291cbd09cf957f4fbe4983d1bbf825a8..9920a5e51081a8a12da238de7199e9f66c2880d8 100644 (file)
@@ -33,7 +33,7 @@
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  {
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  {
-@@ -181,6 +197,7 @@ static struct brport_attribute *brport_a
+@@ -181,6 +197,7 @@ static const struct brport_attribute *br
        &brport_attr_hold_timer,
        &brport_attr_flush,
        &brport_attr_hairpin_mode,
        &brport_attr_hold_timer,
        &brport_attr_flush,
        &brport_attr_hairpin_mode,
@@ -55,7 +55,7 @@
                skb = NULL;
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
                skb = NULL;
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
-@@ -109,7 +109,7 @@ void br_deliver(const struct net_bridge_
+@@ -110,7 +110,7 @@ void br_deliver(const struct net_bridge_
  /* called with rcu_read_lock */
  void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
  {
  /* called with rcu_read_lock */
  void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
  {
@@ -64,7 +64,7 @@
                if (skb0)
                        deliver_clone(to, skb, __br_forward);
                else
                if (skb0)
                        deliver_clone(to, skb, __br_forward);
                else
-@@ -164,7 +164,8 @@ out:
+@@ -165,7 +165,8 @@ out:
  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
                     struct sk_buff *skb0,
                     void (*__packet_hook)(const struct net_bridge_port *p,
  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
                     struct sk_buff *skb0,
                     void (*__packet_hook)(const struct net_bridge_port *p,
@@ -74,7 +74,7 @@
  {
        struct net_bridge_port *p;
        struct net_bridge_port *prev;
  {
        struct net_bridge_port *p;
        struct net_bridge_port *prev;
-@@ -172,6 +173,9 @@ static void br_flood(struct net_bridge *
+@@ -173,6 +174,9 @@ static void br_flood(struct net_bridge *
        prev = NULL;
  
        list_for_each_entry_rcu(p, &br->port_list, list) {
        prev = NULL;
  
        list_for_each_entry_rcu(p, &br->port_list, list) {
@@ -84,7 +84,7 @@
                prev = maybe_deliver(prev, p, skb, __packet_hook);
                if (IS_ERR(prev))
                        goto out;
                prev = maybe_deliver(prev, p, skb, __packet_hook);
                if (IS_ERR(prev))
                        goto out;
-@@ -195,14 +199,14 @@ out:
+@@ -196,14 +200,14 @@ out:
  /* called with rcu_read_lock */
  void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
  {
  /* called with rcu_read_lock */
  void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
  {
index 301b6be44197c09a775c28a630e9ba15664fe1c8..035bbf8bc5fe9e14a8d0212ed5ce864651a14618 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
-@@ -91,6 +91,12 @@ extern void                 addrconf_join_solict(struc
+@@ -92,6 +92,12 @@ extern void                 addrconf_join_solict(struc
  extern void                   addrconf_leave_solict(struct inet6_dev *idev,
                                        const struct in6_addr *addr);
  
  extern void                   addrconf_leave_solict(struct inet6_dev *idev,
                                        const struct in6_addr *addr);
  
@@ -11,7 +11,7 @@
 +                                              struct in6_addr *saddr);
 +
  static inline unsigned long addrconf_timeout_fixup(u32 timeout,
 +                                              struct in6_addr *saddr);
 +
  static inline unsigned long addrconf_timeout_fixup(u32 timeout,
-                                                   unsigned unit)
+                                                  unsigned int unit)
  {
 --- a/net/bridge/Kconfig
 +++ b/net/bridge/Kconfig
  {
 --- a/net/bridge/Kconfig
 +++ b/net/bridge/Kconfig
@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -1103,7 +1103,7 @@ out:
+@@ -1099,7 +1099,7 @@ out:
        return ret;
  }
  
        return ret;
  }
  
@@ -41,7 +41,7 @@
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {
-@@ -1228,7 +1228,6 @@ try_nextdev:
+@@ -1224,7 +1224,6 @@ try_nextdev:
        in6_ifa_put(hiscore->ifa);
        return 0;
  }
        in6_ifa_put(hiscore->ifa);
        return 0;
  }
@@ -49,7 +49,7 @@
  
  int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
                    unsigned char banned_flags)
  
  int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
                    unsigned char banned_flags)
-@@ -4840,6 +4839,9 @@ int __init addrconf_init(void)
+@@ -4808,6 +4807,9 @@ int __init addrconf_init(void)
  
        ipv6_addr_label_rtnl_register();
  
  
        ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
-@@ -4858,6 +4860,9 @@ void addrconf_cleanup(void)
+@@ -4826,6 +4828,9 @@ void addrconf_cleanup(void)
        struct net_device *dev;
        int i;
  
        struct net_device *dev;
        int i;
  
index dafe4208179b6abba94e75f44d5e3a1d01913c52..43c850394cce9a16512b2b2e1398ceb72f198b06 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
-@@ -55,7 +55,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+@@ -56,7 +56,7 @@ int br_dev_queue_push_xmit(struct sk_buf
  
  int br_forward_finish(struct sk_buff *skb)
  {
  
  int br_forward_finish(struct sk_buff *skb)
  {
@@ -9,7 +9,7 @@
                       br_dev_queue_push_xmit);
  
  }
                       br_dev_queue_push_xmit);
  
  }
-@@ -74,7 +74,7 @@ static void __br_deliver(const struct ne
+@@ -75,7 +75,7 @@ static void __br_deliver(const struct ne
                return;
        }
  
                return;
        }
  
@@ -18,7 +18,7 @@
                br_forward_finish);
  }
  
                br_forward_finish);
  }
  
-@@ -91,7 +91,7 @@ static void __br_forward(const struct ne
+@@ -92,7 +92,7 @@ static void __br_forward(const struct ne
        skb->dev = to->dev;
        skb_forward_csum(skb);
  
        skb->dev = to->dev;
        skb_forward_csum(skb);
  
@@ -48,7 +48,7 @@
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
                } else {
 @@ -224,7 +224,7 @@ forward:
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
                } else {
 @@ -224,7 +224,7 @@ forward:
-               if (!compare_ether_addr(p->br->dev->dev_addr, dest))
+               if (ether_addr_equal(p->br->dev->dev_addr, dest))
                        skb->pkt_type = PACKET_HOST;
  
 -              NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                        skb->pkt_type = PACKET_HOST;
  
 -              NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
@@ -58,7 +58,7 @@
        default:
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
        default:
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -753,7 +753,7 @@ static void __br_multicast_send_query(st
+@@ -770,7 +770,7 @@ static void __br_multicast_send_query(st
        if (port) {
                __skb_push(skb, sizeof(struct ethhdr));
                skb->dev = port->dev;
        if (port) {
                __skb_push(skb, sizeof(struct ethhdr));
                skb->dev = port->dev;
@@ -69,7 +69,7 @@
                netif_rx(skb);
 --- a/net/bridge/br_netfilter.c
 +++ b/net/bridge/br_netfilter.c
                netif_rx(skb);
 --- a/net/bridge/br_netfilter.c
 +++ b/net/bridge/br_netfilter.c
-@@ -71,6 +71,15 @@ static int brnf_filter_pppoe_tagged __re
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
  #define IS_ARP(skb) \
        (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
  
  #define IS_ARP(skb) \
        (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
  
@@ -87,7 +87,7 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -486,15 +486,29 @@ static inline bool br_multicast_is_route
+@@ -497,15 +497,29 @@ static inline bool br_multicast_is_route
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER
index 5862dc113e9d6034c344a3113accdda1b89b3df7..a89a9f3b748891dbb377940863f3e1480f2584a7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/ppp/pppoe.c
 +++ b/drivers/net/ppp/pppoe.c
 --- a/drivers/net/ppp/pppoe.c
 +++ b/drivers/net/ppp/pppoe.c
-@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
                goto end;
  
  
                goto end;
  
  
@@ -9,7 +9,7 @@
                           0, GFP_KERNEL);
        if (!skb) {
                error = -ENOMEM;
                           0, GFP_KERNEL);
        if (!skb) {
                error = -ENOMEM;
-@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
        }
  
        /* Reserve space for headers. */
        }
  
        /* Reserve space for headers. */
index 5c83d194854e5e50406be1b1c014a4de8f1cf25e..05c820d4447dd1f3f7e5f523a9e63b76def830c5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -145,7 +145,7 @@ static inline bool dev_xmit_complete(int
+@@ -147,7 +147,7 @@ static inline bool dev_xmit_complete(int
   */
  
  #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
   */
  
  #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
index 74f01cebb80835d8a79870a723eda7b5e044d339..bfd297b12d808d439ee98ad4cb6e929e1e824f94 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netlink/af_netlink.c
 +++ b/net/netlink/af_netlink.c
 --- a/net/netlink/af_netlink.c
 +++ b/net/netlink/af_netlink.c
-@@ -854,25 +854,7 @@ void netlink_detachskb(struct sock *sk,
+@@ -880,25 +880,7 @@ void netlink_detachskb(struct sock *sk,
  
  static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
  {
  
  static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
  {
index 5d14daadfac7fe5c3224d77c8c784de642576023..69b259f95eaf90810ca6e3045227ce5d6bfb2b9d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1558,7 +1558,7 @@ static inline int pskb_network_may_pull(
+@@ -1626,7 +1626,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
index 48cb64372eed230af849ea3bd469d262aeadf09f..777ea95d7afb157c0d1a54f794181828dcda5840 100644 (file)
@@ -16,7 +16,7 @@
 +
  comment "MII PHY device drivers"
  
 +
  comment "MII PHY device drivers"
  
- config MARVELL_PHY
+ config AMD_PHY
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
 @@ -3,6 +3,7 @@
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
 @@ -3,6 +3,7 @@
index 201c857d2f77092d9cd1829cb40775818236803e..45464ac7538fc5c4ae1af99a08865d350558ab07 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
+@@ -301,6 +301,50 @@ int phy_ethtool_gset(struct phy_device *
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
@@ -51,7 +51,7 @@
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
-@@ -474,7 +518,7 @@ static void phy_force_reduction(struct p
+@@ -476,7 +520,7 @@ static void phy_force_reduction(struct p
        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);
        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);
@@ -62,7 +62,7 @@
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -515,6 +515,7 @@ void phy_start_machine(struct phy_device
+@@ -542,6 +542,7 @@ void phy_start_machine(struct phy_device
  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
index 0649afb10ab844d879b0a885e12eb4fa756b13e3..8e4443604f191aeab88ee807ca2a298d54af02ef 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
+@@ -408,9 +408,18 @@ struct phy_driver {
         */
        int (*config_aneg)(struct phy_device *phydev);
  
         */
        int (*config_aneg)(struct phy_device *phydev);
  
@@ -21,7 +21,7 @@
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -705,6 +705,9 @@ int genphy_update_link(struct phy_device
+@@ -796,6 +796,9 @@ int genphy_update_link(struct phy_device
  {
        int status;
  
  {
        int status;
  
@@ -33,7 +33,7 @@
  
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
  
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p
+@@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p
  {
        int retval;
  
  {
        int retval;
  
index 2c20d70998b97cdc7ef700318e3967ce60773c0c..db64f5ba99c11b442b618499a8f35a4f763ae283 100644 (file)
@@ -9,7 +9,7 @@
  /**
   * mdiobus_alloc_size - allocate a mii_bus structure
   * @size: extra amount of memory to allocate for private storage.
  /**
   * mdiobus_alloc_size - allocate a mii_bus structure
   * @size: extra amount of memory to allocate for private storage.
-@@ -228,15 +230,33 @@
+@@ -228,15 +230,33 @@ void mdiobus_free(struct mii_bus *bus)
  }
  EXPORT_SYMBOL(mdiobus_free);
  
  }
  EXPORT_SYMBOL(mdiobus_free);
  
@@ -45,7 +45,7 @@
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -543,4 +543,22 @@ int __init mdio_bus_init(void);
+@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;
index c99824a6b02196d98fb34fcf6021a4efb30966c4..0ec5ed579d7d913634eb243dcbc11cc2ae093ca6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -106,6 +106,13 @@ config MICREL_PHY
+@@ -116,6 +116,13 @@ config MICREL_PHY
        ---help---
          Supports the KSZ9021, VSC8201, KS8001 PHYs.
  
        ---help---
          Supports the KSZ9021, VSC8201, KS8001 PHYs.
  
@@ -16,9 +16,9 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_VITESSE_PHY)    += vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)   += broadcom.o
  obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
  obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)     += bcm87xx.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
 +obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
 +obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
index 37f641709960708127a087e7d12a069e158d53d4..c99e64e2433998e5c3f116ab5bcc928308cf9ade 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1078,6 +1078,11 @@ struct net_device {
+@@ -1102,6 +1102,11 @@ struct net_device {
        const struct net_device_ops *netdev_ops;
        const struct ethtool_ops *ethtool_ops;
  
        const struct net_device_ops *netdev_ops;
        const struct ethtool_ops *ethtool_ops;
  
@@ -12,7 +12,7 @@
        /* Hardware header description */
        const struct header_ops *header_ops;
  
        /* Hardware header description */
        const struct header_ops *header_ops;
  
-@@ -1134,6 +1139,9 @@ struct net_device {
+@@ -1158,6 +1163,9 @@ struct net_device {
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1661,6 +1661,10 @@ extern struct sk_buff *dev_alloc_skb(uns
- extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
-               unsigned int length, gfp_t gfp_mask);
+@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu
+       return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
  
 +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
 +              unsigned int length, gfp_t gfp);
 +
 +
  /**
  
 +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
 +              unsigned int length, gfp_t gfp);
 +
 +
  /**
-  *    netdev_alloc_skb - allocate an skbuff for rx on a specific device
-  *    @dev: network device to receive on
-@@ -1680,16 +1684,6 @@ static inline struct sk_buff *netdev_all
-       return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
+  *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *    @skb: buffer to alter
+@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  }
  
 -static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
 -              unsigned int length, gfp_t gfp)
 -{
 -static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
 -              unsigned int length, gfp_t gfp)
 -{
@@ -79,7 +79,7 @@
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2267,9 +2267,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2243,9 +2243,19 @@ int dev_hard_start_xmit(struct sk_buff *
                        }
                }
  
                        }
                }
  
                if (rc == NETDEV_TX_OK)
                        txq_trans_update(txq);
                return rc;
                if (rc == NETDEV_TX_OK)
                        txq_trans_update(txq);
                return rc;
-@@ -2289,9 +2299,19 @@ gso:
+@@ -2265,9 +2275,19 @@ gso:
                if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
                        skb_dst_drop(nskb);
  
                if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
                        skb_dst_drop(nskb);
  
                                goto out_kfree_gso_skb;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
                                goto out_kfree_gso_skb;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
  #include <linux/scatterlist.h>
  #include <linux/errqueue.h>
  #include <linux/prefetch.h>
  #include <linux/scatterlist.h>
  #include <linux/errqueue.h>
  #include <linux/prefetch.h>
  
  #include <net/protocol.h>
  #include <net/dst.h>
  
  #include <net/protocol.h>
  #include <net/dst.h>
-@@ -320,6 +321,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc
  }
  EXPORT_SYMBOL(__netdev_alloc_skb);
  
  }
  EXPORT_SYMBOL(__netdev_alloc_skb);
  
 +EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
 +
  void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
 +EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
 +
  void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
-               int size)
+                    int size, unsigned int truesize)
  {
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
  {
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
-@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+@@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk
        struct ethhdr *eth;
  
        skb->dev = dev;
        struct ethhdr *eth;
  
        skb->dev = dev;
index 8a456117fa0132414f31c73c48d4981d009eed7e..7aa9ee4e1d309658d33f5c9edb7bdcb051a0fefc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -113,6 +113,10 @@ config ADM6996_PHY
+@@ -123,6 +123,10 @@ config ADM6996_PHY
          Currently supports the ADM6996FC and ADM6996M switches.
          Support for FC is very limited.
  
          Currently supports the ADM6996FC and ADM6996M switches.
          Support for FC is very limited.
  
@@ -13,8 +13,8 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)   += broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)     += bcm63xx.o
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)    += bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)     += bcm87xx.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
 +obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
 +obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
index 8eff10cf45b6580f3404c6f89643dfc80c7cc313..0ab3a617b4fb96ff773391a7b93e337ffdf948a4 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -117,6 +117,10 @@ config MVSWITCH_PHY
+@@ -127,6 +127,10 @@ config MVSWITCH_PHY
        tristate "Driver for Marvell 88E6060 switches"
        select ETHERNET_PACKET_MANGLE
  
        tristate "Driver for Marvell 88E6060 switches"
        select ETHERNET_PACKET_MANGLE
  
@@ -13,7 +13,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)    += bcm63xx.o
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)    += bcm87xx.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
  obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
  obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
index eed6e2b92a4ecb7466e10c4472a8e696fff878a8..5f7c20d55b8d5d23f96e3353ec1156f633172c56 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -121,6 +121,11 @@ config IP17XX_PHY
+@@ -131,6 +131,11 @@ config IP17XX_PHY
        tristate "Driver for IC+ IP17xx switches"
        select SWCONFIG
  
        tristate "Driver for IC+ IP17xx switches"
        select SWCONFIG
  
@@ -14,7 +14,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_ADM6996_PHY)    += adm6996.o
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY)    += adm6996.o
  obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
index db0ee6582ef06a25fe3a3c98c7b1dcc80ad4208c..fa791177d3bc034c893cc17e90ac4797b735efa2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -126,6 +126,10 @@ config AR8216_PHY
+@@ -136,6 +136,10 @@ config AR8216_PHY
        select ETHERNET_PACKET_MANGLE
        select SWCONFIG
  
        select ETHERNET_PACKET_MANGLE
        select SWCONFIG
  
@@ -13,7 +13,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_MVSWITCH_PHY)   += mvswitch.o
+@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)   += mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_AR8216_PHY)      += ar8216.o
  obj-$(CONFIG_IP17XX_PHY)      += ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_AR8216_PHY)      += ar8216.o
index d258e4b56441de62bdac2398d8d7a9c1bf7aa14d..fd2da634e7db8552e165146085a1c1534112cfb9 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -168,6 +168,30 @@ config MDIO_OCTEON
-         If in doubt, say Y.
+@@ -197,6 +197,30 @@ config MDIO_BUS_MUX_GPIO
+         several child MDIO busses to a parent bus.  Child bus
+         selection is under the control of GPIO lines.
  
 +config RTL8366_SMI
 +      tristate "Driver for the RTL8366 SMI interface"
  
 +config RTL8366_SMI
 +      tristate "Driver for the RTL8366 SMI interface"
@@ -33,7 +33,7 @@
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
  config MICREL_KS8995MA
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -22,6 +22,9 @@ obj-$(CONFIG_IP17XX_PHY)     += ip17xx.o
+@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)     += ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_AR8216_PHY)      += ar8216.o
  obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_AR8216_PHY)      += ar8216.o
  obj-$(CONFIG_RTL8306_PHY)     += rtl8306.o
index a24f497c9b2ec6b799b6726f14dd42642ac07c28..ded6857d9f80c13d5b3bbc4a074d12fcaff1d2e5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -190,6 +190,10 @@ config RTL8366RB_PHY
+@@ -219,6 +219,10 @@ config RTL8366RB_PHY
        tristate "Driver for the Realtek RTL8366RB switch"
        select SWCONFIG
  
        tristate "Driver for the Realtek RTL8366RB switch"
        select SWCONFIG
  
@@ -13,7 +13,7 @@
  endif # PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
  endif # PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY)    += rtl8306.o
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8306_PHY)    += rtl8306.o
  obj-$(CONFIG_RTL8366_SMI)     += rtl8366_smi.o
  obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
  obj-$(CONFIG_RTL8366_SMI)     += rtl8366_smi.o
  obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
index c41d0309c53817fd61b5c4f1c251ba70d5ac312c..7d132f68a87eef63da5625c47336a3e1c3919714 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -130,6 +130,11 @@ config RTL8306_PHY
+@@ -140,6 +140,11 @@ config RTL8306_PHY
        tristate "Driver for Realtek RTL8306S switches"
        select SWCONFIG
  
        tristate "Driver for Realtek RTL8306S switches"
        select SWCONFIG
  
@@ -14,7 +14,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366S_PHY)   += rtl8366s.o
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366S_PHY)   += rtl8366s.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
  obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
  obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
index 82a7386f96d034f81c14339e2b7027a804f4f643..6db98ffd20a643b2a41a6c3cfeb8213c345e381c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -199,6 +199,10 @@ config RTL8367_PHY
+@@ -228,6 +228,10 @@ config RTL8367_PHY
        tristate "Driver for the Realtek RTL8367R/M switches"
        select SWCONFIG
  
        tristate "Driver for the Realtek RTL8367R/M switches"
        select SWCONFIG
  
@@ -13,7 +13,7 @@
  endif # PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
  endif # PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8366_SMI)    += rtl8366_smi
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366_SMI)    += rtl8366_smi
  obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
  obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
  obj-$(CONFIG_RTL8366S_PHY)    += rtl8366s.o
  obj-$(CONFIG_RTL8366RB_PHY)   += rtl8366rb.o
  obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
index 0466d94b425adb964c99a1e6dde8722a6b53c7e4..9314479231da8a8a2cfdcf0ed9d68a897d7540c9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -206,3 +206,8 @@ endif # PHYLIB
+@@ -239,3 +239,8 @@ endif # PHYLIB
  config MICREL_KS8995MA
        tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
        depends on SPI
  config MICREL_KS8995MA
        tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
        depends on SPI
@@ -11,8 +11,8 @@
 +      select ETHERNET_PACKET_MANGLE
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
 +      select ETHERNET_PACKET_MANGLE
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366RB_PHY)  += rtl8366rb
- obj-$(CONFIG_RTL8367_PHY)     += rtl8367.o
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY)    += rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_MICREL_PHY)      += micrel.o
 +obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_MICREL_PHY)      += micrel.o
 +obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
index 8e2ec9afce15995ca17334f279544dbd71f2b197..91033dc4810eec329c251a23aeb32e15499be574 100644 (file)
@@ -64,7 +64,7 @@
  #endif /* HOSTAP_H */
 --- a/drivers/net/wireless/hostap/hostap_hw.c
 +++ b/drivers/net/wireless/hostap/hostap_hw.c
  #endif /* HOSTAP_H */
 --- a/drivers/net/wireless/hostap/hostap_hw.c
 +++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
                        prism2_hw_reset(dev);
        }
  
                        prism2_hw_reset(dev);
        }
  
index 4802157189248046e262e224ae7c1ad18f9a6905..85e3c97b8da284be60e1af8b2c00ff8441edca14 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config XEN_PCIDEV_FRONTEND
+@@ -64,6 +64,12 @@ config XEN_PCIDEV_FRONTEND
            The PCI device frontend driver allows the kernel to import arbitrary
            PCI devices from a PCI backend to support PCI driver domains.
  
            The PCI device frontend driver allows the kernel to import arbitrary
            PCI devices from a PCI backend to support PCI driver domains.
  
        default y
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
        default y
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -105,6 +105,7 @@ static void __devinit quirk_mmio_always_
- }
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
+@@ -44,6 +44,7 @@ static void __devinit quirk_mmio_always_
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
                              PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
  
 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
  
 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -1990,7 +1991,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1933,7 +1934,9 @@ static void __devinit fixup_rev1_53c810(
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,9 +33,9 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+@@ -2605,6 +2608,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1083,
                        quirk_msi_intx_disable_bug);
                        quirk_msi_intx_disable_bug);
  #endif /* CONFIG_PCI_MSI */
 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  
  #endif /* CONFIG_PCI_MSI */
 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  
index 7bf8eaf1e195791eff0d4dfbaa820d1bf2b24962..6debec9c8cc50a5832f8dc09e7c22ff8abad5ac1 100644 (file)
@@ -1,7 +1,7 @@
 
 --- a/drivers/usb/host/pci-quirks.c
 +++ b/drivers/usb/host/pci-quirks.c
 
 --- a/drivers/usb/host/pci-quirks.c
 +++ b/drivers/usb/host/pci-quirks.c
-@@ -432,6 +432,8 @@ reset_needed:
+@@ -434,6 +434,8 @@ reset_needed:
  }
  EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
  
  }
  EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
  
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
-@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha
-       pci_disable_device(pdev);
+@@ -964,3 +966,4 @@ static void __devinit quirk_usb_early_ha
  }
  }
- DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
-+
-+#endif
---- a/drivers/usb/host/pci-quirks.h
-+++ b/drivers/usb/host/pci-quirks.h
-@@ -8,9 +8,17 @@ int usb_amd_find_chipset_info(void);
- void usb_amd_dev_put(void);
- void usb_amd_quirk_pll_disable(void);
- void usb_amd_quirk_pll_enable(void);
-+#if !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
- bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
- void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
- #else
-+static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
-+{
-+      return false;
-+}
-+static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+                       PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
 +#endif
 +#endif
-+#else
- static inline void usb_amd_quirk_pll_disable(void) {}
- static inline void usb_amd_quirk_pll_enable(void) {}
- static inline void usb_amd_dev_put(void) {}
index ee50ff90efa8eac035820b74b1cca394fc39d5cb..6b72a47698de174a70ff4b8a08d7f45381189263 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/usb/core/usb.c
 +++ b/drivers/usb/core/usb.c
 --- a/drivers/usb/core/usb.c
 +++ b/drivers/usb/core/usb.c
-@@ -652,6 +652,71 @@ int __usb_get_extra_descriptor(char *buf
+@@ -653,6 +653,71 @@ int __usb_get_extra_descriptor(char *buf
  }
  EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
  
  }
  EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
  
@@ -74,7 +74,7 @@
   * @dev: device the buffer will be used with
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
   * @dev: device the buffer will be used with
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
-@@ -531,6 +531,7 @@ extern int usb_lock_device_for_reset(str
+@@ -584,6 +584,7 @@ extern int usb_lock_device_for_reset(str
  extern int usb_reset_device(struct usb_device *dev);
  extern void usb_queue_reset_device(struct usb_interface *dev);
  
  extern int usb_reset_device(struct usb_device *dev);
  extern void usb_queue_reset_device(struct usb_interface *dev);
  
index 3283807f2b3b2c5f14135ec15e17aff58a093224..9692712eac03ea21fcde60a395a5a72ebf861743 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -480,4 +480,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
-       depends on LEDS_TRIGGERS
+@@ -537,4 +537,8 @@ config LEDS_TRIGGER_TRANSIENT
+         GPIO/PWM based hardware.
+         If unsure, say Y.
  
 +config LEDS_TRIGGER_MORSE
 +      tristate "LED Morse Trigger"
  
 +config LEDS_TRIGGER_MORSE
 +      tristate "LED Morse Trigger"
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)  += ledtrig-backlight.o
+@@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)  += ledtrig-transient.o
 +obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 --- a/drivers/leds/ledtrig-morse.c
 +++ b/drivers/leds/ledtrig-morse.c
 +obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 --- a/drivers/leds/ledtrig-morse.c
 +++ b/drivers/leds/ledtrig-morse.c
index 7f94b1cd396fa17f26a5149aa178cd6352faf8c6..cd00fddd5ff984149e71136bbc6e8f5bbcca9e2c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -484,4 +484,11 @@ config LEDS_TRIGGER_MORSE
+@@ -541,4 +541,11 @@ config LEDS_TRIGGER_MORSE
        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  
        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  
@@ -14,9 +14,9 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
+@@ -64,3 +64,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)              += ledt
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)  += ledtrig-transient.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 --- a/drivers/leds/ledtrig-netdev.c
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 --- a/drivers/leds/ledtrig-netdev.c
index 8933497e84877aac899bf31c46649b6b973a8839..ef8715e64026aaacfa9d260ce503029ef2da6d2f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -491,4 +491,11 @@ config LEDS_TRIGGER_NETDEV
+@@ -548,4 +548,11 @@ config LEDS_TRIGGER_NETDEV
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
@@ -14,8 +14,8 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -59,3 +59,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)              += ledt
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
+@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)        +=
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)  += ledtrig-transient.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
index 35dd3b8bd7367f4b6e656e2e3a35eb6c790d951f..6c96116ea4d6cefd9177e29622210fc37b416618 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
-@@ -719,6 +719,15 @@ config RTC_DRV_NUC900
+@@ -716,6 +716,15 @@ config RTC_DRV_NUC900
          If you say yes here you get support for the RTC subsystem of the
          NUC910/NUC920 used in embedded systems.
  
          If you say yes here you get support for the RTC subsystem of the
          NUC910/NUC920 used in embedded systems.
  
@@ -18,7 +18,7 @@
  config RTC_DRV_DAVINCI
 --- a/drivers/rtc/Makefile
 +++ b/drivers/rtc/Makefile
  config RTC_DRV_DAVINCI
 --- a/drivers/rtc/Makefile
 +++ b/drivers/rtc/Makefile
-@@ -86,6 +86,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
+@@ -89,6 +89,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
  obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o
  obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
  obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o
  obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o
  obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
  obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o
index 2c9e6035aa98cd46c99666ae81e66c9ebf3ae9a1..17b3d755d2a995f2917d9faff27ff96e2e0df834 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
-@@ -379,6 +379,15 @@ config RTC_DRV_RV3029C2
+@@ -389,6 +389,15 @@ config RTC_DRV_RV3029C2
          This driver can also be built as a module. If so, the module
          will be called rtc-rv3029c2.
  
          This driver can also be built as a module. If so, the module
          will be called rtc-rv3029c2.
  
@@ -18,7 +18,7 @@
  comment "SPI RTC drivers"
 --- a/drivers/rtc/Makefile
 +++ b/drivers/rtc/Makefile
  comment "SPI RTC drivers"
 --- a/drivers/rtc/Makefile
 +++ b/drivers/rtc/Makefile
-@@ -79,6 +79,7 @@ obj-$(CONFIG_RTC_DRV_PL030)  += rtc-pl030
+@@ -82,6 +82,7 @@ obj-$(CONFIG_RTC_DRV_PL030)  += rtc-pl030
  obj-$(CONFIG_RTC_DRV_PL031)   += rtc-pl031.o
  obj-$(CONFIG_RTC_DRV_PM8XXX)  += rtc-pm8xxx.o
  obj-$(CONFIG_RTC_DRV_PS3)     += rtc-ps3.o
  obj-$(CONFIG_RTC_DRV_PL031)   += rtc-pl031.o
  obj-$(CONFIG_RTC_DRV_PM8XXX)  += rtc-pm8xxx.o
  obj-$(CONFIG_RTC_DRV_PS3)     += rtc-ps3.o
index 6cbea32a3186fd7e5b542e17da0438743d811809..16d80d95873bf8022555d8bae344fd456f9d4dc9 100644 (file)
@@ -345,7 +345,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -154,6 +154,15 @@ config SPI_GPIO
+@@ -169,6 +169,15 @@ config SPI_GPIO
          GPIO operations, you should be able to leverage that for better
          speed with a custom version of this driver; see the source code.
  
          GPIO operations, you should be able to leverage that for better
          speed with a custom version of this driver; see the source code.
  
@@ -363,7 +363,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
        depends on ARCH_MXC
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
        depends on ARCH_MXC
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_FSL_LIB)            += spi-fsl-li
+@@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_FSL_LIB)            += spi-fsl-li
  obj-$(CONFIG_SPI_FSL_ESPI)            += spi-fsl-espi.o
  obj-$(CONFIG_SPI_FSL_SPI)             += spi-fsl-spi.o
  obj-$(CONFIG_SPI_GPIO)                        += spi-gpio.o
  obj-$(CONFIG_SPI_FSL_ESPI)            += spi-fsl-espi.o
  obj-$(CONFIG_SPI_FSL_SPI)             += spi-fsl-spi.o
  obj-$(CONFIG_SPI_GPIO)                        += spi-gpio.o
index 32606711f5e551204146236fdbccb3ee0474a701..2e8d4da123020ebb0c069671a3ef46f3d3c31677 100644 (file)
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
-@@ -474,6 +474,31 @@ config MMC_SDHI
+@@ -467,6 +467,31 @@ config MMC_SDHI
          This provides support for the SDHI SD/SDIO controller found in
          SuperH and ARM SH-Mobile SoCs
  
          This provides support for the SDHI SD/SDIO controller found in
          SuperH and ARM SH-Mobile SoCs
  
        depends on PCI
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
        depends on PCI
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
-@@ -37,6 +37,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+@@ -36,6 +36,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
  obj-$(CONFIG_MMC_SDHI)                += sh_mobile_sdhi.o
  obj-$(CONFIG_MMC_CB710)               += cb710-mmc.o
  obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o
 +obj-$(CONFIG_GPIOMMC)         += gpiommc.o
  obj-$(CONFIG_SDH_BFIN)                += bfin_sdh.o
  obj-$(CONFIG_MMC_DW)          += dw_mmc.o
  obj-$(CONFIG_MMC_SDHI)                += sh_mobile_sdhi.o
  obj-$(CONFIG_MMC_CB710)               += cb710-mmc.o
  obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o
 +obj-$(CONFIG_GPIOMMC)         += gpiommc.o
  obj-$(CONFIG_SDH_BFIN)                += bfin_sdh.o
  obj-$(CONFIG_MMC_DW)          += dw_mmc.o
- obj-$(CONFIG_MMC_SH_MMCIF)    += sh_mmcif.o
+ obj-$(CONFIG_MMC_DW_PLTFM)    += dw_mmc-pltfm.o
 --- /dev/null
 +++ b/include/linux/mmc/gpiommc.h
 @@ -0,0 +1,71 @@
 --- /dev/null
 +++ b/include/linux/mmc/gpiommc.h
 @@ -0,0 +1,71 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3045,6 +3045,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -3188,6 +3188,11 @@ L:      linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
 +
  HARDWARE MONITORING
  M:    Jean Delvare <khali@linux-fr.org>
 +
  HARDWARE MONITORING
  M:    Jean Delvare <khali@linux-fr.org>
- M:    Guenter Roeck <guenter.roeck@ericsson.com>
+ M:    Guenter Roeck <linux@roeck-us.net>
index 015f14ab319c11693a38103d858d9ace45319d55..0ed0c966dd14086cc1f07965735d812a1487cbdc 100644 (file)
  source "drivers/power/Kconfig"
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
  source "drivers/power/Kconfig"
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -8,6 +8,7 @@
- # GPIO must come after pinctrl as gpios may need to mux pins etc
- obj-y                         += pinctrl/
+@@ -10,6 +10,7 @@ obj-y                                += pinctrl/
  obj-y                         += gpio/
  obj-y                         += gpio/
-+obj-$(CONFIG_GENERIC_PWM)     += pwm/
+ obj-y                         += pwm/
  obj-$(CONFIG_PCI)             += pci/
  obj-$(CONFIG_PCI)             += pci/
++obj-$(CONFIG_GENERIC_PWM)     += pwm/
  obj-$(CONFIG_PARISC)          += parisc/
  obj-$(CONFIG_RAPIDIO)         += rapidio/
  obj-$(CONFIG_PARISC)          += parisc/
  obj-$(CONFIG_RAPIDIO)         += rapidio/
+ obj-y                         += video/
index 981610dad1a7daf12acd8672f826d3e3f8e7e192..02c9d8f9aa6f02934b103a9f7df5c83d542707b2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
-@@ -423,6 +423,15 @@ config SENSORS_GL520SM
+@@ -434,6 +434,15 @@ config SENSORS_GL520SM
          This driver can also be built as a module.  If so, the module
          will be called gl520sm.
  
          This driver can also be built as a module.  If so, the module
          will be called gl520sm.
  
 +
  config SENSORS_GPIO_FAN
        tristate "GPIO fan"
 +
  config SENSORS_GPIO_FAN
        tristate "GPIO fan"
-       depends on GENERIC_GPIO
+       depends on GPIOLIB
 --- a/drivers/hwmon/Makefile
 +++ b/drivers/hwmon/Makefile
 --- a/drivers/hwmon/Makefile
 +++ b/drivers/hwmon/Makefile
-@@ -125,6 +125,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)    += w83l7
+@@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)    += w83l7
  obj-$(CONFIG_SENSORS_W83L786NG)       += w83l786ng.o
  obj-$(CONFIG_SENSORS_WM831X)  += wm831x-hwmon.o
  obj-$(CONFIG_SENSORS_WM8350)  += wm8350-hwmon.o
  obj-$(CONFIG_SENSORS_W83L786NG)       += w83l786ng.o
  obj-$(CONFIG_SENSORS_WM831X)  += wm831x-hwmon.o
  obj-$(CONFIG_SENSORS_WM8350)  += wm8350-hwmon.o
index 1c9569450adc080c3cf22a2efb916592056a58da..b77b9f0f97b6e661f050e893e1f3f936f2ce9a88 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -127,8 +127,8 @@ unsigned int kmem_cache_size(struct kmem
+@@ -151,8 +151,8 @@ unsigned int kmem_cache_size(struct kmem
   * to do various tricks to work around compiler limitations in order to
   * ensure proper constant folding.
   */
   * to do various tricks to work around compiler limitations in order to
   * ensure proper constant folding.
   */
index aa9a40f0998100b97c1fd4303c54f4d992d08194..9ee9cff6701dcc299113aee3b2f0874483379d2f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
-@@ -50,6 +50,18 @@ static const char *kobject_actions[] = {
+@@ -51,6 +51,18 @@ static const char *kobject_actions[] = {
        [KOBJ_OFFLINE] =        "offline",
  };
  
        [KOBJ_OFFLINE] =        "offline",
  };
  
index 104df13bf295ef69d91bbb26e5d5a9cc3f4508f1..7bc6d15d84a2c69648040c52abcd3bcf9f7f037d 100644 (file)
@@ -39,7 +39,7 @@
  #endif /* _KOBJECT_H_ */
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
  #endif /* _KOBJECT_H_ */
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
-@@ -381,6 +381,43 @@ int add_uevent_var(struct kobj_uevent_en
+@@ -382,6 +382,43 @@ int add_uevent_var(struct kobj_uevent_en
  EXPORT_SYMBOL_GPL(add_uevent_var);
  
  #if defined(CONFIG_NET)
  EXPORT_SYMBOL_GPL(add_uevent_var);
  
  #if defined(CONFIG_NET)
index 11f67dc2c9269e6bf2af0768fc406bb00a5f8ffd..f9bcf1673cb4ee6f92b2169e379edb46fe4d478c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
 --- a/init/main.c
 +++ b/init/main.c
-@@ -816,7 +816,7 @@ static int __init kernel_init(void * unu
+@@ -868,7 +868,7 @@ static int __init kernel_init(void * unu
  
        /* Open the /dev/console on the rootfs, this should never fail */
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  
        /* Open the /dev/console on the rootfs, this should never fail */
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
index a71251dcd7f2ca11f27138b1d9c4cee94a153bb7..abd00c65f8f3cf85e9209f6b2271968d8befafe3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
 --- a/init/main.c
 +++ b/init/main.c
-@@ -774,10 +774,7 @@ static noinline int init_post(void)
+@@ -826,10 +826,7 @@ static noinline int init_post(void)
                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }
                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }
index bce0ea40cc352e70bd939062aa975261a7463b34..5231907f8b513724fe3d2c9fa10f8df63aa79836 100644 (file)
@@ -20,7 +20,7 @@
 +#endif
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +#endif
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -926,6 +926,10 @@ config RELAY
+@@ -1105,6 +1105,10 @@ config RELAY
  
          If unsure, say N.
  
  
          If unsure, say N.
  
@@ -33,7 +33,7 @@
        depends on BROKEN || !FRV
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
        depends on BROKEN || !FRV
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -107,6 +107,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us
+@@ -110,6 +110,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us
  obj-$(CONFIG_PADATA) += padata.o
  obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
  obj-$(CONFIG_JUMP_LABEL) += jump_label.o
  obj-$(CONFIG_PADATA) += padata.o
  obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
  obj-$(CONFIG_JUMP_LABEL) += jump_label.o
  
  static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
  static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
  
  static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
  static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
-@@ -305,6 +306,8 @@ static void __init_memblock memblock_ins
+@@ -341,6 +342,8 @@ static void __init_memblock memblock_ins
        memblock_set_region_node(rgn, nid);
        type->cnt++;
        type->total_size += size;
        memblock_set_region_node(rgn, nid);
        type->cnt++;
        type->total_size += size;
index b5cce90a1bc1269e1d2d6968fef7ce0003039a60..61519b5cf746a01a57008be49ac48c5208be89de 100644 (file)
@@ -1,6 +1,6 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -968,3 +968,6 @@ config CRYPTO_USER_API_SKCIPHER
+@@ -1052,3 +1052,6 @@ config CRYPTO_USER_API_SKCIPHER
  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO
  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO
index 794627a85489493450afb01e2c835cbeac487224..3c24fe42f976e3fdaeb496e30ebb853cc93f64e2 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -131,6 +131,9 @@
-  *    void add_interrupt_randomness(int irq, int irq_flags);
-  *    void add_disk_randomness(struct gendisk *disk);
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
   *
 + *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
 + *      int random_input_wait(void);
   *
 + *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
 + *      int random_input_wait(void);
@@ -24,7 +24,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
-@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
+@@ -799,6 +809,63 @@ void add_disk_randomness(struct gendisk
  }
  #endif
  
  }
  #endif
  
@@ -90,7 +90,7 @@
   * Entropy extraction routines
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
   * Entropy extraction routines
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+@@ -143,6 +143,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
        }
        return ret;
  }
        }
        return ret;
  }
index 1cd970c80519d289db48c244a79c2c4eae1a83b0..cac3bc99cc632a2066cb42f2e39939af24489148 100644 (file)
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2490,6 +2490,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2902,6 +2902,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
  
  /* common code */
  
  
  /* common code */
  
@@ -17,7 +17,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2567,11 +2577,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2979,11 +2989,8 @@ int shmem_zero_setup(struct vm_area_stru
        if (IS_ERR(file))
                return PTR_ERR(file);
  
        if (IS_ERR(file))
                return PTR_ERR(file);
  
@@ -33,7 +33,7 @@
  
 --- a/fs/file.c
 +++ b/fs/file.c
  
 --- a/fs/file.c
 +++ b/fs/file.c
-@@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
+@@ -269,6 +269,7 @@ int expand_files(struct files_struct *fi
        /* All good, so we try */
        return expand_fdtable(files, nr);
  }
        /* All good, so we try */
        return expand_fdtable(files, nr);
  }
@@ -43,7 +43,7 @@
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
-@@ -500,6 +500,7 @@ struct files_struct *get_files_struct(st
+@@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st
  
        return files;
  }
  
        return files;
  }
@@ -51,7 +51,7 @@
  
  void put_files_struct(struct files_struct *files)
  {
  
  void put_files_struct(struct files_struct *files)
  {
-@@ -521,6 +522,7 @@ void put_files_struct(struct files_struc
+@@ -534,6 +535,7 @@ void put_files_struct(struct files_struc
                rcu_read_unlock();
        }
  }
                rcu_read_unlock();
        }
  }
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
  {
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3854,6 +3854,7 @@ int can_nice(const struct task_struct *p
+@@ -4106,6 +4106,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1412,6 +1412,7 @@ unsigned long zap_page_range(struct vm_a
-       tlb_finish_mmu(&tlb, address, end);
-       return end;
+@@ -1408,6 +1408,7 @@ void zap_page_range(struct vm_area_struc
+       mmu_notifier_invalidate_range_end(mm, start, end);
+       tlb_finish_mmu(&tlb, start, end);
  }
 +EXPORT_SYMBOL_GPL(zap_page_range);
  
  /**
  }
 +EXPORT_SYMBOL_GPL(zap_page_range);
  
  /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -3087,6 +3088,7 @@ static inline int check_stack_guard_page
-       }
-       return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
+  * zap_page_range_single - remove user pages in a given range
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -1257,6 +1257,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1266,6 +1266,7 @@ void unmap_kernel_range(unsigned long ad
        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
  }
        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
  }
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {
-@@ -1394,6 +1395,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1403,6 +1404,7 @@ struct vm_struct *get_vm_area(unsigned l
        return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
                                -1, GFP_KERNEL, __builtin_return_address(0));
  }
 +EXPORT_SYMBOL_GPL(get_vm_area);
  
  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
        return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
                                -1, GFP_KERNEL, __builtin_return_address(0));
  }
 +EXPORT_SYMBOL_GPL(get_vm_area);
  
  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
-                               void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -872,6 +872,7 @@ extern bool skip_free_areas_node(unsigne
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- extern int can_do_mlock(void);
+                               const void *caller)
+--- a/include/linux/shmem_fs.h
++++ b/include/linux/shmem_fs.h
+@@ -46,6 +46,8 @@ extern int shmem_init(void);
+ extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
+ extern struct file *shmem_file_setup(const char *name,
+                                       loff_t size, unsigned long flags);
++
++extern void shmem_set_file(struct vm_area_struct *vma, struct file *file);
+ extern int shmem_zero_setup(struct vm_area_struct *);
+ extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
+ extern void shmem_unlock_mapping(struct address_space *mapping);
index 391511c8fd8f39df50db3ddc19d0f584495528cb..ff2530b27fdc62520c702806e790df092a5d09fb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/tools/mach-types
 +++ b/arch/arm/tools/mach-types
 --- a/arch/arm/tools/mach-types
 +++ b/arch/arm/tools/mach-types
-@@ -12,531 +12,3179 @@
+@@ -12,539 +12,3428 @@
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new
  #
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new
  #
@@ -8,8 +8,8 @@
 -# are merged into mainline or have been edited in the machine database
 -# within the last 12 months.  References to machine_is_NAME() do not count!
 -#
 -# are merged into mainline or have been edited in the machine database
 -# within the last 12 months.  References to machine_is_NAME() do not count!
 -#
--# Last update: Tue Dec 6 11:07:38 2011
-+# Last update: Fri Apr 20 08:30:36 2012
+-# Last update: Thu Apr 26 08:44:23 2012
++# Last update: Tue Oct 23 13:49:50 2012
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
 +mtt_ranger            MACH_MTT_RANGER         MTT_RANGER              1018
 +nexus                 MACH_NEXUS              NEXUS                   1019
 +desman                        MACH_DESMAN             DESMAN                  1020
 +mtt_ranger            MACH_MTT_RANGER         MTT_RANGER              1018
 +nexus                 MACH_NEXUS              NEXUS                   1019
 +desman                        MACH_DESMAN             DESMAN                  1020
-+bkde303                       MACH_BKDE303            BKDE303                 1021
+ bkde303                       MACH_BKDE303            BKDE303                 1021
  smdk2413              MACH_SMDK2413           SMDK2413                1022
 +aml_m7200             MACH_AML_M7200          AML_M7200               1023
  aml_m5900             MACH_AML_M5900          AML_M5900               1024
  smdk2413              MACH_SMDK2413           SMDK2413                1022
 +aml_m7200             MACH_AML_M7200          AML_M7200               1023
  aml_m5900             MACH_AML_M5900          AML_M5900               1024
 +actia_tgw             MACH_ACTIA_TGW          ACTIA_TGW               2169
 +e4430                 MACH_E4430              E4430                   2170
 +ql300                 MACH_QL300              QL300                   2171
 +actia_tgw             MACH_ACTIA_TGW          ACTIA_TGW               2169
 +e4430                 MACH_E4430              E4430                   2170
 +ql300                 MACH_QL300              QL300                   2171
- btmavb101             MACH_BTMAVB101          BTMAVB101               2172
- btmawb101             MACH_BTMAWB101          BTMAWB101               2173
++btmavb101             MACH_BTMAVB101          BTMAVB101               2172
++btmawb101             MACH_BTMAWB101          BTMAWB101               2173
 +sq201                 MACH_SQ201              SQ201                   2174
 +quatro45xx            MACH_QUATRO45XX         QUATRO45XX              2175
 +openpad                       MACH_OPENPAD            OPENPAD                 2176
 +sq201                 MACH_SQ201              SQ201                   2174
 +quatro45xx            MACH_QUATRO45XX         QUATRO45XX              2175
 +openpad                       MACH_OPENPAD            OPENPAD                 2176
 +irvine                        MACH_IRVINE             IRVINE                  2217
 +sff772                        MACH_SFF772             SFF772                  2218
 +pelco_milano          MACH_PELCO_MILANO       PELCO_MILANO            2219
 +irvine                        MACH_IRVINE             IRVINE                  2217
 +sff772                        MACH_SFF772             SFF772                  2218
 +pelco_milano          MACH_PELCO_MILANO       PELCO_MILANO            2219
- pc7302                        MACH_PC7302             PC7302                  2220
++pc7302                        MACH_PC7302             PC7302                  2220
 +bip6000                       MACH_BIP6000            BIP6000                 2221
 +silvermoon            MACH_SILVERMOON         SILVERMOON              2222
 +vc0830                        MACH_VC0830             VC0830                  2223
 +bip6000                       MACH_BIP6000            BIP6000                 2221
 +silvermoon            MACH_SILVERMOON         SILVERMOON              2222
 +vc0830                        MACH_VC0830             VC0830                  2223
 +dilax_pcu200          MACH_DILAX_PCU200       DILAX_PCU200            2299
 +leonardo              MACH_LEONARDO           LEONARDO                2300
 +zoran_approach7               MACH_ZORAN_APPROACH7    ZORAN_APPROACH7         2301
 +dilax_pcu200          MACH_DILAX_PCU200       DILAX_PCU200            2299
 +leonardo              MACH_LEONARDO           LEONARDO                2300
 +zoran_approach7               MACH_ZORAN_APPROACH7    ZORAN_APPROACH7         2301
- dp6xx                 MACH_DP6XX              DP6XX                   2302
++dp6xx                 MACH_DP6XX              DP6XX                   2302
 +bcm2153_vesper                MACH_BCM2153_VESPER     BCM2153_VESPER          2303
  mahimahi              MACH_MAHIMAHI           MAHIMAHI                2304
 +clickc                        MACH_CLICKC             CLICKC                  2305
 +bcm2153_vesper                MACH_BCM2153_VESPER     BCM2153_VESPER          2303
  mahimahi              MACH_MAHIMAHI           MAHIMAHI                2304
 +clickc                        MACH_CLICKC             CLICKC                  2305
 +magnolia2             MACH_MAGNOLIA2          MAGNOLIA2               2573
 +emxx                  MACH_EMXX               EMXX                    2574
 +outlaw                        MACH_OUTLAW             OUTLAW                  2575
 +magnolia2             MACH_MAGNOLIA2          MAGNOLIA2               2573
 +emxx                  MACH_EMXX               EMXX                    2574
 +outlaw                        MACH_OUTLAW             OUTLAW                  2575
- riot_bei2             MACH_RIOT_BEI2          RIOT_BEI2               2576
++riot_bei2             MACH_RIOT_BEI2          RIOT_BEI2               2576
 +riot_gx2              MACH_RIOT_VOX           RIOT_VOX                2577
 +riot_gx2              MACH_RIOT_VOX           RIOT_VOX                2577
- riot_x37              MACH_RIOT_X37           RIOT_X37                2578
++riot_x37              MACH_RIOT_X37           RIOT_X37                2578
 +mega25mx              MACH_MEGA25MX           MEGA25MX                2579
 +benzina2              MACH_BENZINA2           BENZINA2                2580
 +ignite                        MACH_IGNITE             IGNITE                  2581
 +mega25mx              MACH_MEGA25MX           MEGA25MX                2579
 +benzina2              MACH_BENZINA2           BENZINA2                2580
 +ignite                        MACH_IGNITE             IGNITE                  2581
 +micro2440             MACH_MICRO2440          MICRO2440               2680
 +am2440                        MACH_AM2440             AM2440                  2681
 +tq2440                        MACH_TQ2440             TQ2440                  2682
 +micro2440             MACH_MICRO2440          MICRO2440               2680
 +am2440                        MACH_AM2440             AM2440                  2681
 +tq2440                        MACH_TQ2440             TQ2440                  2682
- ea2478devkit          MACH_EA2478DEVKIT       EA2478DEVKIT            2683
++ea2478devkit          MACH_EA2478DEVKIT       EA2478DEVKIT            2683
 +ak880x                        MACH_AK880X             AK880X                  2684
 +cobra3530             MACH_COBRA3530          COBRA3530               2685
 +pmppb                 MACH_PMPPB              PMPPB                   2686
 +ak880x                        MACH_AK880X             AK880X                  2684
 +cobra3530             MACH_COBRA3530          COBRA3530               2685
 +pmppb                 MACH_PMPPB              PMPPB                   2686
  msm8x60_surf          MACH_MSM8X60_SURF       MSM8X60_SURF            2755
  msm8x60_sim           MACH_MSM8X60_SIM        MSM8X60_SIM             2756
  tcc8000_sdk           MACH_TCC8000_SDK        TCC8000_SDK             2758
  msm8x60_surf          MACH_MSM8X60_SURF       MSM8X60_SURF            2755
  msm8x60_sim           MACH_MSM8X60_SIM        MSM8X60_SIM             2756
  tcc8000_sdk           MACH_TCC8000_SDK        TCC8000_SDK             2758
- nanos                 MACH_NANOS              NANOS                   2759
++nanos                 MACH_NANOS              NANOS                   2759
 +stamp9g10             MACH_STAMP9G10          STAMP9G10               2760
 +stamp9g10             MACH_STAMP9G10          STAMP9G10               2760
- stamp9g45             MACH_STAMP9G45          STAMP9G45               2761
++stamp9g45             MACH_STAMP9G45          STAMP9G45               2761
 +h6053                 MACH_H6053              H6053                   2762
 +smint01                       MACH_SMINT01            SMINT01                 2763
 +prtlvt2                       MACH_PRTLVT2            PRTLVT2                 2764
 +h6053                 MACH_H6053              H6053                   2762
 +smint01                       MACH_SMINT01            SMINT01                 2763
 +prtlvt2                       MACH_PRTLVT2            PRTLVT2                 2764
 +omap3_tao3530         MACH_OMAP3_TAO3530      OMAP3_TAO3530           2836
 +omap3_pcutouch                MACH_OMAP3_PCUTOUCH     OMAP3_PCUTOUCH          2837
  smdkc210              MACH_SMDKC210           SMDKC210                2838
 +omap3_tao3530         MACH_OMAP3_TAO3530      OMAP3_TAO3530           2836
 +omap3_pcutouch                MACH_OMAP3_PCUTOUCH     OMAP3_PCUTOUCH          2837
  smdkc210              MACH_SMDKC210           SMDKC210                2838
--pca102                        MACH_PCA102             PCA102                  2843
 +omap3_braillo         MACH_OMAP3_BRAILLO      OMAP3_BRAILLO           2839
 +spyplug                       MACH_SPYPLUG            SPYPLUG                 2840
 +ginger                        MACH_GINGER             GINGER                  2841
 +tny_t3530             MACH_TNY_T3530          TNY_T3530               2842
 +omap3_braillo         MACH_OMAP3_BRAILLO      OMAP3_BRAILLO           2839
 +spyplug                       MACH_SPYPLUG            SPYPLUG                 2840
 +ginger                        MACH_GINGER             GINGER                  2841
 +tny_t3530             MACH_TNY_T3530          TNY_T3530               2842
-+pcaal1                        MACH_PCAAL1             PCAAL1                  2843
+ pcaal1                        MACH_PCAAL1             PCAAL1                  2843
 +spade                 MACH_SPADE              SPADE                   2844
 +mxc25_topaz           MACH_MXC25_TOPAZ        MXC25_TOPAZ             2845
  t5325                 MACH_T5325              T5325                   2846
 +spade                 MACH_SPADE              SPADE                   2844
 +mxc25_topaz           MACH_MXC25_TOPAZ        MXC25_TOPAZ             2845
  t5325                 MACH_T5325              T5325                   2846
 +xsbase255             MACH_XSBASE255          XSBASE255               2854
 +pvm2030                       MACH_PVM2030            PVM2030                 2855
 +mioa502                       MACH_MIOA502            MIOA502                 2856
 +xsbase255             MACH_XSBASE255          XSBASE255               2854
 +pvm2030                       MACH_PVM2030            PVM2030                 2855
 +mioa502                       MACH_MIOA502            MIOA502                 2856
- vvbox_sdorig2         MACH_VVBOX_SDORIG2      VVBOX_SDORIG2           2857
- vvbox_sdlite2         MACH_VVBOX_SDLITE2      VVBOX_SDLITE2           2858
- vvbox_sdpro4          MACH_VVBOX_SDPRO4       VVBOX_SDPRO4            2859
++vvbox_sdorig2         MACH_VVBOX_SDORIG2      VVBOX_SDORIG2           2857
++vvbox_sdlite2         MACH_VVBOX_SDLITE2      VVBOX_SDLITE2           2858
++vvbox_sdpro4          MACH_VVBOX_SDPRO4       VVBOX_SDPRO4            2859
 +htc_spv_m700          MACH_HTC_SPV_M700       HTC_SPV_M700            2860
  mx257sx                       MACH_MX257SX            MX257SX                 2861
  goni                  MACH_GONI               GONI                    2862
 +htc_spv_m700          MACH_HTC_SPV_M700       HTC_SPV_M700            2860
  mx257sx                       MACH_MX257SX            MX257SX                 2861
  goni                  MACH_GONI               GONI                    2862
 +blueshark             MACH_BLUESHARK          BLUESHARK               2907
 +e10                   MACH_E10                E10                     2908
 +app3k_robin           MACH_APP3K_ROBIN        APP3K_ROBIN             2909
 +blueshark             MACH_BLUESHARK          BLUESHARK               2907
 +e10                   MACH_E10                E10                     2908
 +app3k_robin           MACH_APP3K_ROBIN        APP3K_ROBIN             2909
-+pov15hd                       MACH_POV15HD            POV15HD                 2910
+ pov15hd                       MACH_POV15HD            POV15HD                 2910
 +stella                        MACH_STELLA             STELLA                  2911
  linkstation_lschl     MACH_LINKSTATION_LSCHL  LINKSTATION_LSCHL       2913
 +netwalker             MACH_NETWALKER          NETWALKER               2914
 +stella                        MACH_STELLA             STELLA                  2911
  linkstation_lschl     MACH_LINKSTATION_LSCHL  LINKSTATION_LSCHL       2913
 +netwalker             MACH_NETWALKER          NETWALKER               2914
 +spdm                  MACH_SPDM               SPDM                    3037
 +gtib                  MACH_GTIB               GTIB                    3038
 +dgm3240                       MACH_DGM3240            DGM3240                 3039
 +spdm                  MACH_SPDM               SPDM                    3037
 +gtib                  MACH_GTIB               GTIB                    3038
 +dgm3240                       MACH_DGM3240            DGM3240                 3039
++iv_atlas_i_lpe                MACH_ATLAS_I_LPE        ATLAS_I_LPE             3040
 +htcmega                       MACH_HTCMEGA            HTCMEGA                 3041
 +tricorder             MACH_TRICORDER          TRICORDER               3042
  tx28                  MACH_TX28               TX28                    3043
 +htcmega                       MACH_HTCMEGA            HTCMEGA                 3041
 +tricorder             MACH_TRICORDER          TRICORDER               3042
  tx28                  MACH_TX28               TX28                    3043
 +unino1                        MACH_UNINO1             UNINO1                  3223
 +greeco                        MACH_GREECO             GREECO                  3224
 +verdi                 MACH_VERDI              VERDI                   3225
 +unino1                        MACH_UNINO1             UNINO1                  3223
 +greeco                        MACH_GREECO             GREECO                  3224
 +verdi                 MACH_VERDI              VERDI                   3225
- dm6446_adbox          MACH_DM6446_ADBOX       DM6446_ADBOX            3226
- quad_salsa            MACH_QUAD_SALSA         QUAD_SALSA              3227
- abb_gma_1_1           MACH_ABB_GMA_1_1        ABB_GMA_1_1             3228
-@@ -603,7 +3251,9 @@ isc3                      MACH_ISC3               ISC3                    3291
- rascal                        MACH_RASCAL             RASCAL                  3292
++dm6446_adbox          MACH_DM6446_ADBOX       DM6446_ADBOX            3226
++quad_salsa            MACH_QUAD_SALSA         QUAD_SALSA              3227
++abb_gma_1_1           MACH_ABB_GMA_1_1        ABB_GMA_1_1             3228
++svcid                 MACH_SVCID              SVCID                   3229
+ msm8960_sim           MACH_MSM8960_SIM        MSM8960_SIM             3230
+ msm8960_rumi3         MACH_MSM8960_RUMI3      MSM8960_RUMI3           3231
++icon_g                        MACH_ICON_G             ICON_G                  3232
++mb3                   MACH_MB3                MB3                     3233
+ gsia18s                       MACH_GSIA18S            GSIA18S                 3234
++pivicc                        MACH_PIVICC             PIVICC                  3235
++pcm048                        MACH_PCM048             PCM048                  3236
++dds                   MACH_DDS                DDS                     3237
++chalten_xa1           MACH_CHALTEN_XA1        CHALTEN_XA1             3238
++ts48xx                        MACH_TS48XX             TS48XX                  3239
++tonga2_tfttimer               MACH_TONGA2_TFTTIMER    TONGA2_TFTTIMER         3240
++whistler              MACH_WHISTLER           WHISTLER                3241
++asl_phoenix           MACH_ASL_PHOENIX        ASL_PHOENIX             3242
++at91sam9263otlite     MACH_AT91SAM9263OTLITE  AT91SAM9263OTLITE       3243
++ddplug                        MACH_DDPLUG             DDPLUG                  3244
++d2plug                        MACH_D2PLUG             D2PLUG                  3245
++kzm9d                 MACH_KZM9D              KZM9D                   3246
++verdi_lte             MACH_VERDI_LTE          VERDI_LTE               3247
++nanozoom              MACH_NANOZOOM           NANOZOOM                3248
++dm3730_som_lv         MACH_DM3730_SOM_LV      DM3730_SOM_LV           3249
++dm3730_torpedo                MACH_DM3730_TORPEDO     DM3730_TORPEDO          3250
++anchovy                       MACH_ANCHOVY            ANCHOVY                 3251
++re2rev20              MACH_RE2REV20           RE2REV20                3253
++re2rev21              MACH_RE2REV21           RE2REV21                3254
++cns21xx                       MACH_CNS21XX            CNS21XX                 3255
++rider                 MACH_RIDER              RIDER                   3257
++nsk330                        MACH_NSK330             NSK330                  3258
++cns2133evb            MACH_CNS2133EVB         CNS2133EVB              3259
++z3_816x_mod           MACH_Z3_816X_MOD        Z3_816X_MOD             3260
++z3_814x_mod           MACH_Z3_814X_MOD        Z3_814X_MOD             3261
++beect                 MACH_BEECT              BEECT                   3262
++dma_thunderbug                MACH_DMA_THUNDERBUG     DMA_THUNDERBUG          3263
++omn_at91sam9g20               MACH_OMN_AT91SAM9G20    OMN_AT91SAM9G20         3264
++mx25_e2s_uc           MACH_MX25_E2S_UC        MX25_E2S_UC             3265
++mione                 MACH_MIONE              MIONE                   3266
++top9000_tcu           MACH_TOP9000_TCU        TOP9000_TCU             3267
++top9000_bsl           MACH_TOP9000_BSL        TOP9000_BSL             3268
++kingdom                       MACH_KINGDOM            KINGDOM                 3269
++armadillo460          MACH_ARMADILLO460       ARMADILLO460            3270
++lq2                   MACH_LQ2                LQ2                     3271
++sweda_tms2            MACH_SWEDA_TMS2         SWEDA_TMS2              3272
+ mx53_loco             MACH_MX53_LOCO          MX53_LOCO               3273
++acer_a8                       MACH_ACER_A8            ACER_A8                 3275
++acer_gauguin          MACH_ACER_GAUGUIN       ACER_GAUGUIN            3276
++guppy                 MACH_GUPPY              GUPPY                   3277
++mx61_ard              MACH_MX61_ARD           MX61_ARD                3278
+ tx53                  MACH_TX53               TX53                    3279
++omapl138_case_a3      MACH_OMAPL138_CASE_A3   OMAPL138_CASE_A3        3280
++uemd                  MACH_UEMD               UEMD                    3281
++ccwmx51mut            MACH_CCWMX51MUT         CCWMX51MUT              3282
++rockhopper            MACH_ROCKHOPPER         ROCKHOPPER              3283
+ encore                        MACH_ENCORE             ENCORE                  3284
++hkdkc100              MACH_HKDKC100           HKDKC100                3285
++ts42xx                        MACH_TS42XX             TS42XX                  3286
++aebl                  MACH_AEBL               AEBL                    3287
+ wario                 MACH_WARIO              WARIO                   3288
++gfs_spm                       MACH_GFS_SPM            GFS_SPM                 3289
+ cm_t3730              MACH_CM_T3730           CM_T3730                3290
++isc3                  MACH_ISC3               ISC3                    3291
++rascal                        MACH_RASCAL             RASCAL                  3292
  hrefv60                       MACH_HREFV60            HREFV60                 3293
  hrefv60                       MACH_HREFV60            HREFV60                 3293
- tpt_2_0                       MACH_TPT_2_0            TPT_2_0                 3294
++tpt_2_0                       MACH_TPT_2_0            TPT_2_0                 3294
 +pydtd                 MACH_PYRAMID_TD         PYRAMID_TD              3295
 +pydtd                 MACH_PYRAMID_TD         PYRAMID_TD              3295
- splendor              MACH_SPLENDOR           SPLENDOR                3296
++splendor              MACH_SPLENDOR           SPLENDOR                3296
 +guf_vincell           MACH_GUF_PLANET         GUF_PLANET              3297
 +guf_vincell           MACH_GUF_PLANET         GUF_PLANET              3297
- msm8x60_qt            MACH_MSM8X60_QT         MSM8X60_QT              3298
- htc_hd_mini           MACH_HTC_HD_MINI        HTC_HD_MINI             3299
- athene                        MACH_ATHENE             ATHENE                  3300
-@@ -614,6 +3264,7 @@ rfl109145_ssrv            MACH_RFL109145_SSRV     RFL1
- nmh                   MACH_NMH                NMH                     3305
- wn802t                        MACH_WN802T             WN802T                  3306
- dragonet              MACH_DRAGONET           DRAGONET                3307
++msm8x60_qt            MACH_MSM8X60_QT         MSM8X60_QT              3298
++htc_hd_mini           MACH_HTC_HD_MINI        HTC_HD_MINI             3299
++athene                        MACH_ATHENE             ATHENE                  3300
++deep_r_ek_1           MACH_DEEP_R_EK_1        DEEP_R_EK_1             3301
++vivow_ct              MACH_VIVOW_CT           VIVOW_CT                3302
++nery_1000             MACH_NERY_1000          NERY_1000               3303
++rfl109145_ssrv                MACH_RFL109145_SSRV     RFL109145_SSRV          3304
++nmh                   MACH_NMH                NMH                     3305
++wn802t                        MACH_WN802T             WN802T                  3306
++dragonet              MACH_DRAGONET           DRAGONET                3307
 +geneva_b4             MACH_GENEVA_B           GENEVA_B                3308
 +geneva_b4             MACH_GENEVA_B           GENEVA_B                3308
- at91sam9263desk16l    MACH_AT91SAM9263DESK16L AT91SAM9263DESK16L      3309
- bcmhana_sv            MACH_BCMHANA_SV         BCMHANA_SV              3310
- bcmhana_tablet                MACH_BCMHANA_TABLET     BCMHANA_TABLET          3311
-@@ -621,11 +3272,13 @@ koi                     MACH_KOI                KOI                     3312
- ts4800                        MACH_TS4800             TS4800                  3313
- tqma9263              MACH_TQMA9263           TQMA9263                3314
- holiday                       MACH_HOLIDAY            HOLIDAY                 3315
++at91sam9263desk16l    MACH_AT91SAM9263DESK16L AT91SAM9263DESK16L      3309
++bcmhana_sv            MACH_BCMHANA_SV         BCMHANA_SV              3310
++bcmhana_tablet                MACH_BCMHANA_TABLET     BCMHANA_TABLET          3311
++koi                   MACH_KOI                KOI                     3312
++ts4800                        MACH_TS4800             TS4800                  3313
++tqma9263              MACH_TQMA9263           TQMA9263                3314
++holiday                       MACH_HOLIDAY            HOLIDAY                 3315
 +dma_6410              MACH_DMA6410            DMA6410                 3316
 +dma_6410              MACH_DMA6410            DMA6410                 3316
- pcats_overlay         MACH_PCATS_OVERLAY      PCATS_OVERLAY           3317
- hwgw6410              MACH_HWGW6410           HWGW6410                3318
- shenzhou              MACH_SHENZHOU           SHENZHOU                3319
- cwme9210              MACH_CWME9210           CWME9210                3320
- cwme9210js            MACH_CWME9210JS         CWME9210JS              3321
++pcats_overlay         MACH_PCATS_OVERLAY      PCATS_OVERLAY           3317
++hwgw6410              MACH_HWGW6410           HWGW6410                3318
++shenzhou              MACH_SHENZHOU           SHENZHOU                3319
++cwme9210              MACH_CWME9210           CWME9210                3320
++cwme9210js            MACH_CWME9210JS         CWME9210JS              3321
 +pgs_v1                        MACH_PGS_SITARA         PGS_SITARA              3322
 +pgs_v1                        MACH_PGS_SITARA         PGS_SITARA              3322
- colibri_tegra2                MACH_COLIBRI_TEGRA2     COLIBRI_TEGRA2          3323
- w21                   MACH_W21                W21                     3324
- polysat1              MACH_POLYSAT1           POLYSAT1                3325
-@@ -691,11 +3344,15 @@ viprinet                MACH_VIPRINET           VIPRINET                3385
- bockw                 MACH_BOCKW              BOCKW                   3386
- eva2000                       MACH_EVA2000            EVA2000                 3387
- steelyard             MACH_STEELYARD          STEELYARD               3388
++colibri_tegra2                MACH_COLIBRI_TEGRA2     COLIBRI_TEGRA2          3323
++w21                   MACH_W21                W21                     3324
++polysat1              MACH_POLYSAT1           POLYSAT1                3325
++dataway                       MACH_DATAWAY            DATAWAY                 3326
++cobral138             MACH_COBRAL138          COBRAL138               3327
++roverpcs8             MACH_ROVERPCS8          ROVERPCS8               3328
++marvelc                       MACH_MARVELC            MARVELC                 3329
++navefihid             MACH_NAVEFIHID          NAVEFIHID               3330
++dm365_cv100           MACH_DM365_CV100        DM365_CV100             3331
++able                  MACH_ABLE               ABLE                    3332
++legacy                        MACH_LEGACY             LEGACY                  3333
++icong                 MACH_ICONG              ICONG                   3334
++rover_g8              MACH_ROVER_G8           ROVER_G8                3335
++t5388p                        MACH_T5388P             T5388P                  3336
++dingo                 MACH_DINGO              DINGO                   3337
++goflexhome            MACH_GOFLEXHOME         GOFLEXHOME              3338
++lanreadyfn511         MACH_LANREADYFN511      LANREADYFN511           3340
++omap3_baia            MACH_OMAP3_BAIA         OMAP3_BAIA              3341
++omap3smartdisplay     MACH_OMAP3SMARTDISPLAY  OMAP3SMARTDISPLAY       3342
++xilinx                        MACH_XILINX             XILINX                  3343
++a2f                   MACH_A2F                A2F                     3344
++sky25                 MACH_SKY25              SKY25                   3345
++ccmx53                        MACH_CCMX53             CCMX53                  3346
++ccmx53js              MACH_CCMX53JS           CCMX53JS                3347
++ccwmx53                       MACH_CCWMX53            CCWMX53                 3348
++ccwmx53js             MACH_CCWMX53JS          CCWMX53JS               3349
++frisms                        MACH_FRISMS             FRISMS                  3350
++msm7x27a_ffa          MACH_MSM7X27A_FFA       MSM7X27A_FFA            3351
++msm7x27a_surf         MACH_MSM7X27A_SURF      MSM7X27A_SURF           3352
++msm7x27a_rumi3                MACH_MSM7X27A_RUMI3     MSM7X27A_RUMI3          3353
++dimmsam9g20           MACH_DIMMSAM9G20        DIMMSAM9G20             3354
++dimm_imx28            MACH_DIMM_IMX28         DIMM_IMX28              3355
++amk_a4                        MACH_AMK_A4             AMK_A4                  3356
++gnet_sgme             MACH_GNET_SGME          GNET_SGME               3357
++shooter_u             MACH_SHOOTER_U          SHOOTER_U               3358
++vmx53                 MACH_VMX53              VMX53                   3359
++rhino                 MACH_RHINO              RHINO                   3360
+ armlex4210            MACH_ARMLEX4210         ARMLEX4210              3361
++swarcoextmodem                MACH_SWARCOEXTMODEM     SWARCOEXTMODEM          3362
+ snowball              MACH_SNOWBALL           SNOWBALL                3363
++pcm049                        MACH_PCM049             PCM049                  3364
++vigor                 MACH_VIGOR              VIGOR                   3365
++oslo_amundsen         MACH_OSLO_AMUNDSEN      OSLO_AMUNDSEN           3366
++gsl_diamond           MACH_GSL_DIAMOND        GSL_DIAMOND             3367
++cv2201                        MACH_CV2201             CV2201                  3368
++cv2202                        MACH_CV2202             CV2202                  3369
++cv2203                        MACH_CV2203             CV2203                  3370
++vit_ibox              MACH_VIT_IBOX           VIT_IBOX                3371
++dm6441_esp            MACH_DM6441_ESP         DM6441_ESP              3372
++at91sam9x5ek          MACH_AT91SAM9X5EK       AT91SAM9X5EK            3373
++libra                 MACH_LIBRA              LIBRA                   3374
++easycrrh              MACH_EASYCRRH           EASYCRRH                3375
++tripel                        MACH_TRIPEL             TRIPEL                  3376
++endian_mini           MACH_ENDIAN_MINI        ENDIAN_MINI             3377
+ xilinx_ep107          MACH_XILINX_EP107       XILINX_EP107            3378
+ nuri                  MACH_NURI               NURI                    3379
++janus                 MACH_JANUS              JANUS                   3380
++ddnas                 MACH_DDNAS              DDNAS                   3381
++tag                   MACH_TAG                TAG                     3382
++tagw                  MACH_TAGW               TAGW                    3383
++nitrogen_vm_imx51     MACH_NITROGEN_VM_IMX51  NITROGEN_VM_IMX51       3384
++viprinet              MACH_VIPRINET           VIPRINET                3385
++bockw                 MACH_BOCKW              BOCKW                   3386
++eva2000                       MACH_EVA2000            EVA2000                 3387
++steelyard             MACH_STEELYARD          STEELYARD               3388
 +ea2468devkit          MACH_LPC2468OEM         LPC2468OEM              3389
 +sdh001                        MACH_MACH_SDH001        MACH_SDH001             3390
 +fe2478mblox           MACH_LPC2478MICROBLOX   LPC2478MICROBLOX        3391
 +ea2468devkit          MACH_LPC2468OEM         LPC2468OEM              3389
 +sdh001                        MACH_MACH_SDH001        MACH_SDH001             3390
 +fe2478mblox           MACH_LPC2478MICROBLOX   LPC2478MICROBLOX        3391
- nsslsboard            MACH_NSSLSBOARD         NSSLSBOARD              3392
- geneva_b5             MACH_GENEVA_B5          GENEVA_B5               3393
- spear1340             MACH_SPEAR1340          SPEAR1340               3394
- rexmas                        MACH_REXMAS             REXMAS                  3395
- msm8960_cdp           MACH_MSM8960_CDP        MSM8960_CDP             3396
++nsslsboard            MACH_NSSLSBOARD         NSSLSBOARD              3392
++geneva_b5             MACH_GENEVA_B5          GENEVA_B5               3393
++spear1340             MACH_SPEAR1340          SPEAR1340               3394
++rexmas                        MACH_REXMAS             REXMAS                  3395
++msm8960_cdp           MACH_MSM8960_CDP        MSM8960_CDP             3396
 +msm8960_mtp           MACH_MSM8960_MDP        MSM8960_MDP             3397
 +msm8960_mtp           MACH_MSM8960_MDP        MSM8960_MDP             3397
- msm8960_fluid         MACH_MSM8960_FLUID      MSM8960_FLUID           3398
- msm8960_apq           MACH_MSM8960_APQ        MSM8960_APQ             3399
- helios_v2             MACH_HELIOS_V2          HELIOS_V2               3400
-@@ -727,6 +3384,7 @@ gt_i5700          MACH_GT_I5700           GT_I5700                3425
- ctera_plug_c2         MACH_CTERA_PLUG_C2      CTERA_PLUG_C2           3426
- marvelct              MACH_MARVELCT           MARVELCT                3427
- ag11005                       MACH_AG11005            AG11005                 3428
++msm8960_fluid         MACH_MSM8960_FLUID      MSM8960_FLUID           3398
++msm8960_apq           MACH_MSM8960_APQ        MSM8960_APQ             3399
++helios_v2             MACH_HELIOS_V2          HELIOS_V2               3400
++mif10p                        MACH_MIF10P             MIF10P                  3401
++iam28                 MACH_IAM28              IAM28                   3402
++picasso                       MACH_PICASSO            PICASSO                 3403
++mr301a                        MACH_MR301A             MR301A                  3404
++notle                 MACH_NOTLE              NOTLE                   3405
++eelx2                 MACH_EELX2              EELX2                   3406
++moon                  MACH_MOON               MOON                    3407
++ruby                  MACH_RUBY               RUBY                    3408
++goldengate            MACH_GOLDENGATE         GOLDENGATE              3409
++ctbu_gen2             MACH_CTBU_GEN2          CTBU_GEN2               3410
++kmp_am17_01           MACH_KMP_AM17_01        KMP_AM17_01             3411
+ wtplug                        MACH_WTPLUG             WTPLUG                  3412
++mx27su2                       MACH_MX27SU2            MX27SU2                 3413
++nb31                  MACH_NB31               NB31                    3414
++hjsdu                 MACH_HJSDU              HJSDU                   3415
++td3_rev1              MACH_TD3_REV1           TD3_REV1                3416
++eag_ci4000            MACH_EAG_CI4000         EAG_CI4000              3417
++net5big_nand_v2               MACH_NET5BIG_NAND_V2    NET5BIG_NAND_V2         3418
++cpx2                  MACH_CPX2               CPX2                    3419
++net2big_nand_v2               MACH_NET2BIG_NAND_V2    NET2BIG_NAND_V2         3420
++ecuv5                 MACH_ECUV5              ECUV5                   3421
++hsgx6d                        MACH_HSGX6D             HSGX6D                  3422
++dawad7                        MACH_DAWAD7             DAWAD7                  3423
++sam9repeater          MACH_SAM9REPEATER       SAM9REPEATER            3424
++gt_i5700              MACH_GT_I5700           GT_I5700                3425
++ctera_plug_c2         MACH_CTERA_PLUG_C2      CTERA_PLUG_C2           3426
++marvelct              MACH_MARVELCT           MARVELCT                3427
++ag11005                       MACH_AG11005            AG11005                 3428
 +omap_tabletblaze      MACH_OMAP_BLAZE         OMAP_BLAZE              3429
 +omap_tabletblaze      MACH_OMAP_BLAZE         OMAP_BLAZE              3429
- vangogh                       MACH_VANGOGH            VANGOGH                 3430
- matrix505             MACH_MATRIX505          MATRIX505               3431
- oce_nigma             MACH_OCE_NIGMA          OCE_NIGMA               3432
-@@ -766,6 +3424,7 @@ h1600                     MACH_H1600              H1600                   3465
- mini210                       MACH_MINI210            MINI210                 3466
- mini8168              MACH_MINI8168           MINI8168                3467
- pc7308                        MACH_PC7308             PC7308                  3468
++vangogh                       MACH_VANGOGH            VANGOGH                 3430
++matrix505             MACH_MATRIX505          MATRIX505               3431
++oce_nigma             MACH_OCE_NIGMA          OCE_NIGMA               3432
++t55                   MACH_T55                T55                     3433
++bio3k                 MACH_BIO3K              BIO3K                   3434
++expressct             MACH_EXPRESSCT          EXPRESSCT               3435
++cardhu                        MACH_CARDHU             CARDHU                  3436
++aruba                 MACH_ARUBA              ARUBA                   3437
++bonaire                       MACH_BONAIRE            BONAIRE                 3438
++nuc700evb             MACH_NUC700EVB          NUC700EVB               3439
++nuc710evb             MACH_NUC710EVB          NUC710EVB               3440
++nuc740evb             MACH_NUC740EVB          NUC740EVB               3441
++nuc745evb             MACH_NUC745EVB          NUC745EVB               3442
++transcede             MACH_TRANSCEDE          TRANSCEDE               3443
++mora                  MACH_MORA               MORA                    3444
++nda_evm                       MACH_NDA_EVM            NDA_EVM                 3445
++timu                  MACH_TIMU               TIMU                    3446
++expressh              MACH_EXPRESSH           EXPRESSH                3447
+ veridis_a300          MACH_VERIDIS_A300       VERIDIS_A300            3448
++dm368_leopard         MACH_DM368_LEOPARD      DM368_LEOPARD           3449
++omap_mcop             MACH_OMAP_MCOP          OMAP_MCOP               3450
++tritip                        MACH_TRITIP             TRITIP                  3451
++sm1k                  MACH_SM1K               SM1K                    3452
++monch                 MACH_MONCH              MONCH                   3453
++curacao                       MACH_CURACAO            CURACAO                 3454
+ origen                        MACH_ORIGEN             ORIGEN                  3455
++epc10                 MACH_EPC10              EPC10                   3456
++sgh_i740              MACH_SGH_I740           SGH_I740                3457
++tuna                  MACH_TUNA               TUNA                    3458
++mx51_tulip            MACH_MX51_TULIP         MX51_TULIP              3459
++mx51_aster7           MACH_MX51_ASTER7        MX51_ASTER7             3460
++acro37xbrd            MACH_ACRO37XBRD         ACRO37XBRD              3461
++elke                  MACH_ELKE               ELKE                    3462
++sbc6000x              MACH_SBC6000X           SBC6000X                3463
++r1801e                        MACH_R1801E             R1801E                  3464
++h1600                 MACH_H1600              H1600                   3465
++mini210                       MACH_MINI210            MINI210                 3466
++mini8168              MACH_MINI8168           MINI8168                3467
++pc7308                        MACH_PC7308             PC7308                  3468
 +ge863_pro3_evk                MACH_GE863              GE863                   3469
 +ge863_pro3_evk                MACH_GE863              GE863                   3469
- kmm2m01                       MACH_KMM2M01            KMM2M01                 3470
- mx51erebus            MACH_MX51EREBUS         MX51EREBUS              3471
++kmm2m01                       MACH_KMM2M01            KMM2M01                 3470
++mx51erebus            MACH_MX51EREBUS         MX51EREBUS              3471
  wm8650refboard                MACH_WM8650REFBOARD     WM8650REFBOARD          3472
  wm8650refboard                MACH_WM8650REFBOARD     WM8650REFBOARD          3472
-@@ -802,6 +3461,7 @@ shooter_k         MACH_SHOOTER_K          SHOOTER_K               35
++tuxrail                       MACH_TUXRAIL            TUXRAIL                 3473
++arthur                        MACH_ARTHUR             ARTHUR                  3474
++doorboy                       MACH_DOORBOY            DOORBOY                 3475
+ xarina                        MACH_XARINA             XARINA                  3476
++roverx7                       MACH_ROVERX7            ROVERX7                 3477
+ sdvr                  MACH_SDVR               SDVR                    3478
+ acer_maya             MACH_ACER_MAYA          ACER_MAYA               3479
+ pico                  MACH_PICO               PICO                    3480
+@@ -573,6 +3462,7 @@ shooter_k         MACH_SHOOTER_K          SHOOTER_K               35
  nspire                        MACH_NSPIRE             NSPIRE                  3503
  mickxx                        MACH_MICKXX             MICKXX                  3504
  lxmb                  MACH_LXMB               LXMB                    3505
  nspire                        MACH_NSPIRE             NSPIRE                  3503
  mickxx                        MACH_MICKXX             MICKXX                  3504
  lxmb                  MACH_LXMB               LXMB                    3505
  adam                  MACH_ADAM               ADAM                    3507
  b1004                 MACH_B1004              B1004                   3508
  oboea                 MACH_OBOEA              OBOEA                   3509
  adam                  MACH_ADAM               ADAM                    3507
  b1004                 MACH_B1004              B1004                   3508
  oboea                 MACH_OBOEA              OBOEA                   3509
-@@ -879,6 +3539,7 @@ bct                       MACH_BCT                BCT                     3582
+@@ -650,6 +3540,7 @@ bct                       MACH_BCT                BCT                     3582
  tuscan                        MACH_TUSCAN             TUSCAN                  3583
  xbt_sam9g45           MACH_XBT_SAM9G45        XBT_SAM9G45             3584
  enbw_cmc              MACH_ENBW_CMC           ENBW_CMC                3585
  tuscan                        MACH_TUSCAN             TUSCAN                  3583
  xbt_sam9g45           MACH_XBT_SAM9G45        XBT_SAM9G45             3584
  enbw_cmc              MACH_ENBW_CMC           ENBW_CMC                3585
  ch104mx257            MACH_CH104MX257         CH104MX257              3587
  openpri                       MACH_OPENPRI            OPENPRI                 3588
  am335xevm             MACH_AM335XEVM          AM335XEVM               3589
  ch104mx257            MACH_CH104MX257         CH104MX257              3587
  openpri                       MACH_OPENPRI            OPENPRI                 3588
  am335xevm             MACH_AM335XEVM          AM335XEVM               3589
-@@ -900,6 +3561,7 @@ cinema                    MACH_CINEMA             CINEMA                  3604
+@@ -671,6 +3562,7 @@ cinema                    MACH_CINEMA             CINEMA                  3604
  cinema_tea            MACH_CINEMA_TEA         CINEMA_TEA              3605
  cinema_coffee         MACH_CINEMA_COFFEE      CINEMA_COFFEE           3606
  cinema_juice          MACH_CINEMA_JUICE       CINEMA_JUICE            3607
  cinema_tea            MACH_CINEMA_TEA         CINEMA_TEA              3605
  cinema_coffee         MACH_CINEMA_COFFEE      CINEMA_COFFEE           3606
  cinema_juice          MACH_CINEMA_JUICE       CINEMA_JUICE            3607
  mx53_mirage2          MACH_MX53_MIRAGE2       MX53_MIRAGE2            3609
  mx53_efikasb          MACH_MX53_EFIKASB       MX53_EFIKASB            3610
  stm_b2000             MACH_STM_B2000          STM_B2000               3612
  mx53_mirage2          MACH_MX53_MIRAGE2       MX53_MIRAGE2            3609
  mx53_efikasb          MACH_MX53_EFIKASB       MX53_EFIKASB            3610
  stm_b2000             MACH_STM_B2000          STM_B2000               3612
-@@ -965,6 +3627,7 @@ pia_am35x         MACH_PIA_AM35X          PIA_AM35X               36
+@@ -736,6 +3628,7 @@ pia_am35x         MACH_PIA_AM35X          PIA_AM35X               36
  cedar                 MACH_CEDAR              CEDAR                   3672
  picasso_e             MACH_PICASSO_E          PICASSO_E               3673
  samsung_e60           MACH_SAMSUNG_E60        SAMSUNG_E60             3674
  cedar                 MACH_CEDAR              CEDAR                   3672
  picasso_e             MACH_PICASSO_E          PICASSO_E               3673
  samsung_e60           MACH_SAMSUNG_E60        SAMSUNG_E60             3674
  sdvr_mini             MACH_SDVR_MINI          SDVR_MINI               3676
  omap3_ij3k            MACH_OMAP3_IJ3K         OMAP3_IJ3K              3677
  modasmc1              MACH_MODASMC1           MODASMC1                3678
  sdvr_mini             MACH_SDVR_MINI          SDVR_MINI               3676
  omap3_ij3k            MACH_OMAP3_IJ3K         OMAP3_IJ3K              3677
  modasmc1              MACH_MODASMC1           MODASMC1                3678
-@@ -992,6 +3655,8 @@ fmc_uic                   MACH_FMC_UIC            FMC_UIC                 3699
+@@ -763,6 +3656,8 @@ fmc_uic                   MACH_FMC_UIC            FMC_UIC                 3699
  fmc_dcm                       MACH_FMC_DCM            FMC_DCM                 3700
  batwm                 MACH_BATWM              BATWM                   3701
  atlas6cb              MACH_ATLAS6CB           ATLAS6CB                3702
  fmc_dcm                       MACH_FMC_DCM            FMC_DCM                 3700
  batwm                 MACH_BATWM              BATWM                   3701
  atlas6cb              MACH_ATLAS6CB           ATLAS6CB                3702
  blue                  MACH_BLUE               BLUE                    3705
  colorado              MACH_COLORADO           COLORADO                3706
  popc                  MACH_POPC               POPC                    3707
  blue                  MACH_BLUE               BLUE                    3705
  colorado              MACH_COLORADO           COLORADO                3706
  popc                  MACH_POPC               POPC                    3707
-@@ -999,15 +3664,19 @@ promwad_jade            MACH_PROMWAD_JADE       PROMWAD_
- amp                   MACH_AMP                AMP                     3709
- gnet_amp              MACH_GNET_AMP           GNET_AMP                3710
+@@ -772,14 +3667,17 @@ gnet_amp                MACH_GNET_AMP           GNET_AMP                3710
  toques                        MACH_TOQUES             TOQUES                  3711
  toques                        MACH_TOQUES             TOQUES                  3711
-+apx4devkit            MACH_APX4DEVKIT         APX4DEVKIT              3712
+ apx4devkit            MACH_APX4DEVKIT         APX4DEVKIT              3712
  dct_storm             MACH_DCT_STORM          DCT_STORM               3713
 +dm8168z3              MACH_Z3                 Z3                      3714
  owl                   MACH_OWL                OWL                     3715
  dct_storm             MACH_DCT_STORM          DCT_STORM               3713
 +dm8168z3              MACH_Z3                 Z3                      3714
  owl                   MACH_OWL                OWL                     3715
  oslo_elisabeth                MACH_OSLO_ELISABETH     OSLO_ELISABETH          3725
  tt01                  MACH_TT01               TT01                    3726
  msm8930_cdp           MACH_MSM8930_CDP        MSM8930_CDP             3727
  oslo_elisabeth                MACH_OSLO_ELISABETH     OSLO_ELISABETH          3725
  tt01                  MACH_TT01               TT01                    3726
  msm8930_cdp           MACH_MSM8930_CDP        MSM8930_CDP             3727
-@@ -1038,6 +3707,7 @@ ptip_murnau              MACH_PTIP_MURNAU        PTIP_MURNA
+@@ -810,6 +3708,7 @@ ptip_murnau               MACH_PTIP_MURNAU        PTIP_MURNA
  ptip_classic          MACH_PTIP_CLASSIC       PTIP_CLASSIC            3753
  mx53grb                       MACH_MX53GRB            MX53GRB                 3754
  gagarin                       MACH_GAGARIN            GAGARIN                 3755
  ptip_classic          MACH_PTIP_CLASSIC       PTIP_CLASSIC            3753
  mx53grb                       MACH_MX53GRB            MX53GRB                 3754
  gagarin                       MACH_GAGARIN            GAGARIN                 3755
  nas2big                       MACH_NAS2BIG            NAS2BIG                 3757
  superfemto            MACH_SUPERFEMTO         SUPERFEMTO              3758
  teufel                        MACH_TEUFEL             TEUFEL                  3759
  nas2big                       MACH_NAS2BIG            NAS2BIG                 3757
  superfemto            MACH_SUPERFEMTO         SUPERFEMTO              3758
  teufel                        MACH_TEUFEL             TEUFEL                  3759
-@@ -1087,6 +3757,7 @@ ubisys_g1                MACH_UBISYS_G1          UBISYS_G1               38
+@@ -835,6 +3734,7 @@ shelter                   MACH_SHELTER            SHELTER                 3778
+ omap3_devkit8500      MACH_OMAP3_DEVKIT8500   OMAP3_DEVKIT8500        3779
+ edgetd                        MACH_EDGETD             EDGETD                  3780
+ copperyard            MACH_COPPERYARD         COPPERYARD              3781
++edge_test             MACH_EDGE               EDGE                    3782
+ edge_u                        MACH_EDGE_U             EDGE_U                  3783
+ edge_td                       MACH_EDGE_TD            EDGE_TD                 3784
+ wdss                  MACH_WDSS               WDSS                    3785
+@@ -858,6 +3758,7 @@ ubisys_g1         MACH_UBISYS_G1          UBISYS_G1               38
  mx53_pf1              MACH_MX53_PF1           MX53_PF1                3803
  asanti                        MACH_ASANTI             ASANTI                  3804
  volta                 MACH_VOLTA              VOLTA                   3805
  mx53_pf1              MACH_MX53_PF1           MX53_PF1                3803
  asanti                        MACH_ASANTI             ASANTI                  3804
  volta                 MACH_VOLTA              VOLTA                   3805
  knight                        MACH_KNIGHT             KNIGHT                  3807
  beaglebone            MACH_BEAGLEBONE         BEAGLEBONE              3808
  becker                        MACH_BECKER             BECKER                  3809
  knight                        MACH_KNIGHT             KNIGHT                  3807
  beaglebone            MACH_BEAGLEBONE         BEAGLEBONE              3808
  becker                        MACH_BECKER             BECKER                  3809
-@@ -1148,6 +3819,7 @@ primou                   MACH_PRIMOU             PRIMOU                  3864
+@@ -919,6 +3820,7 @@ primou                    MACH_PRIMOU             PRIMOU                  3864
  primoc                        MACH_PRIMOC             PRIMOC                  3865
  primoct                       MACH_PRIMOCT            PRIMOCT                 3866
  a9500                 MACH_A9500              A9500                   3867
  primoc                        MACH_PRIMOC             PRIMOC                  3865
  primoct                       MACH_PRIMOCT            PRIMOCT                 3866
  a9500                 MACH_A9500              A9500                   3867
  pluto                 MACH_PLUTO              PLUTO                   3869
  acfx100                       MACH_ACFX100            ACFX100                 3870
  msm8625_rumi3         MACH_MSM8625_RUMI3      MSM8625_RUMI3           3871
  pluto                 MACH_PLUTO              PLUTO                   3869
  acfx100                       MACH_ACFX100            ACFX100                 3870
  msm8625_rumi3         MACH_MSM8625_RUMI3      MSM8625_RUMI3           3871
-@@ -1161,6 +3833,8 @@ valente_wx               MACH_VALENTE_WX         VALENTE_WX
+@@ -932,6 +3834,8 @@ valente_wx                MACH_VALENTE_WX         VALENTE_WX
  huangshans            MACH_HUANGSHANS         HUANGSHANS              3879
  bosphorus1            MACH_BOSPHORUS1         BOSPHORUS1              3880
  prima                 MACH_PRIMA              PRIMA                   3881
  huangshans            MACH_HUANGSHANS         HUANGSHANS              3879
  bosphorus1            MACH_BOSPHORUS1         BOSPHORUS1              3880
  prima                 MACH_PRIMA              PRIMA                   3881
  evita_ulk             MACH_EVITA_ULK          EVITA_ULK               3884
  merisc600             MACH_MERISC600          MERISC600               3885
  dolak                 MACH_DOLAK              DOLAK                   3886
  evita_ulk             MACH_EVITA_ULK          EVITA_ULK               3884
  merisc600             MACH_MERISC600          MERISC600               3885
  dolak                 MACH_DOLAK              DOLAK                   3886
-@@ -1169,3 +3843,271 @@ elite_ulk              MACH_ELITE_ULK          ELITE_ULK               38
- pov2                  MACH_POV2               POV2                    3889
- ipod_touch_2g         MACH_IPOD_TOUCH_2G      IPOD_TOUCH_2G           3890
- da850_pqab            MACH_DA850_PQAB         DA850_PQAB              3891
-+fermi                 MACH_FERMI              FERMI                   3892
-+ccardwmx28            MACH_CCARDWMX28         CCARDWMX28              3893
-+ccardmx28             MACH_CCARDMX28          CCARDMX28               3894
-+fs20_fcm2050          MACH_FS20_FCM2050       FS20_FCM2050            3895
-+kinetis                       MACH_KINETIS            KINETIS                 3896
-+kai                   MACH_KAI                KAI                     3897
-+bcthb2                        MACH_BCTHB2             BCTHB2                  3898
-+inels3_cu             MACH_INELS3_CU          INELS3_CU               3899
+@@ -948,6 +3852,7 @@ kinetis                   MACH_KINETIS            KINETIS                 3896
+ kai                   MACH_KAI                KAI                     3897
+ bcthb2                        MACH_BCTHB2             BCTHB2                  3898
+ inels3_cu             MACH_INELS3_CU          INELS3_CU               3899
 +da850_juniper         MACH_JUNIPER            JUNIPER                 3900
 +da850_juniper         MACH_JUNIPER            JUNIPER                 3900
-+da850_apollo          MACH_DA850_APOLLO       DA850_APOLLO            3901
-+tracnas                       MACH_TRACNAS            TRACNAS                 3902
-+mityarm335x           MACH_MITYARM335X        MITYARM335X             3903
-+xcgz7x                        MACH_XCGZ7X             XCGZ7X                  3904
-+cubox                 MACH_CUBOX              CUBOX                   3905
-+terminator            MACH_TERMINATOR         TERMINATOR              3906
-+eye03                 MACH_EYE03              EYE03                   3907
-+kota3                 MACH_KOTA3              KOTA3                   3908
+ da850_apollo          MACH_DA850_APOLLO       DA850_APOLLO            3901
+ tracnas                       MACH_TRACNAS            TRACNAS                 3902
+ mityarm335x           MACH_MITYARM335X        MITYARM335X             3903
+@@ -956,6 +3861,7 @@ cubox                     MACH_CUBOX              CUBOX                   3905
+ terminator            MACH_TERMINATOR         TERMINATOR              3906
+ eye03                 MACH_EYE03              EYE03                   3907
+ kota3                 MACH_KOTA3              KOTA3                   3908
 +mx53_nitrogen_k               MACH_MX5                MX5                     3909
 +mx53_nitrogen_k               MACH_MX5                MX5                     3909
-+pscpe                 MACH_PSCPE              PSCPE                   3910
-+akt1100                       MACH_AKT1100            AKT1100                 3911
-+pcaaxl2                       MACH_PCAAXL2            PCAAXL2                 3912
-+primodd_ct            MACH_PRIMODD_CT         PRIMODD_CT              3913
-+nsbc                  MACH_NSBC               NSBC                    3914
-+meson2_skt            MACH_MESON2_SKT         MESON2_SKT              3915
-+meson2_ref            MACH_MESON2_REF         MESON2_REF              3916
-+ccardwmx28js          MACH_CCARDWMX28JS       CCARDWMX28JS            3917
-+ccardmx28js           MACH_CCARDMX28JS        CCARDMX28JS             3918
-+indico                        MACH_INDICO             INDICO                  3919
-+msm8960dt             MACH_MSM8960DT          MSM8960DT               3920
-+primods                       MACH_PRIMODS            PRIMODS                 3921
-+beluga_m1388          MACH_BELUGA_M1388       BELUGA_M1388            3922
-+primotd                       MACH_PRIMOTD            PRIMOTD                 3923
-+varan_master          MACH_VARAN_MASTER       VARAN_MASTER            3924
-+primodd                       MACH_PRIMODD            PRIMODD                 3925
-+jetduo                        MACH_JETDUO             JETDUO                  3926
-+mx53_umobo            MACH_MX53_UMOBO         MX53_UMOBO              3927
-+trats                 MACH_TRATS              TRATS                   3928
-+starcraft             MACH_STARCRAFT          STARCRAFT               3929
-+qseven_tegra2         MACH_QSEVEN_TEGRA2      QSEVEN_TEGRA2           3930
-+lichee_sun4i_devbd    MACH_LICHEE_SUN4I_DEVBD LICHEE_SUN4I_DEVBD      3931
-+movenow                       MACH_MOVENOW            MOVENOW                 3932
-+golf_u                        MACH_GOLF_U             GOLF_U                  3933
-+msm7627a_evb          MACH_MSM7627A_EVB       MSM7627A_EVB            3934
-+rambo                 MACH_RAMBO              RAMBO                   3935
-+golfu                 MACH_GOLFU              GOLFU                   3936
-+mango310              MACH_MANGO310           MANGO310                3937
-+dns343                        MACH_DNS343             DNS343                  3938
-+var_som_om44          MACH_VAR_SOM_OM44       VAR_SOM_OM44            3939
-+naon                  MACH_NAON               NAON                    3940
-+vp4000                        MACH_VP4000             VP4000                  3941
-+impcard                       MACH_IMPCARD            IMPCARD                 3942
-+smoovcam              MACH_SMOOVCAM           SMOOVCAM                3943
-+cobham3725            MACH_COBHAM3725         COBHAM3725              3944
-+cobham3730            MACH_COBHAM3730         COBHAM3730              3945
-+cobham3703            MACH_COBHAM3703         COBHAM3703              3946
-+quetzal                       MACH_QUETZAL            QUETZAL                 3947
-+apq8064_cdp           MACH_APQ8064_CDP        APQ8064_CDP             3948
-+apq8064_mtp           MACH_APQ8064_MTP        APQ8064_MTP             3949
-+apq8064_fluid         MACH_APQ8064_FLUID      APQ8064_FLUID           3950
-+apq8064_liquid                MACH_APQ8064_LIQUID     APQ8064_LIQUID          3951
-+mango210              MACH_MANGO210           MANGO210                3952
-+mango100              MACH_MANGO100           MANGO100                3953
-+mango24                       MACH_MANGO24            MANGO24                 3954
-+mango64                       MACH_MANGO64            MANGO64                 3955
-+nsa320                        MACH_NSA320             NSA320                  3956
-+elv_ccu2              MACH_ELV_CCU2           ELV_CCU2                3957
-+triton_x00            MACH_TRITON_X00         TRITON_X00              3958
-+triton_1500_2000      MACH_TRITON_1500_2000   TRITON_1500_2000        3959
-+pogoplugv4            MACH_POGOPLUGV4         POGOPLUGV4              3960
-+venus_cl              MACH_VENUS_CL           VENUS_CL                3961
-+vulcano_g20           MACH_VULCANO_G20        VULCANO_G20             3962
-+sgs_i9100             MACH_SGS_I9100          SGS_I9100               3963
-+stsv2                 MACH_STSV2              STSV2                   3964
-+csb1724                       MACH_CSB1724            CSB1724                 3965
-+omapl138_lcdk         MACH_OMAPL138_LCDK      OMAPL138_LCDK           3966
+ pscpe                 MACH_PSCPE              PSCPE                   3910
+ akt1100                       MACH_AKT1100            AKT1100                 3911
+ pcaaxl2                       MACH_PCAAXL2            PCAAXL2                 3912
+@@ -1013,10 +3919,12 @@ sgs_i9100              MACH_SGS_I9100          SGS_I9100               39
+ stsv2                 MACH_STSV2              STSV2                   3964
+ csb1724                       MACH_CSB1724            CSB1724                 3965
+ omapl138_lcdk         MACH_OMAPL138_LCDK      OMAPL138_LCDK           3966
 +jel_dd                        MACH_JEWEL_DD           JEWEL_DD                3967
 +jel_dd                        MACH_JEWEL_DD           JEWEL_DD                3967
-+pvd_mx25              MACH_PVD_MX25           PVD_MX25                3968
-+meson6_skt            MACH_MESON6_SKT         MESON6_SKT              3969
-+meson6_ref            MACH_MESON6_REF         MESON6_REF              3970
-+pxm                   MACH_PXM                PXM                     3971
+ pvd_mx25              MACH_PVD_MX25           PVD_MX25                3968
+ meson6_skt            MACH_MESON6_SKT         MESON6_SKT              3969
+ meson6_ref            MACH_MESON6_REF         MESON6_REF              3970
+ pxm                   MACH_PXM                PXM                     3971
 +stuttgart             MACH_S3                 S3                      3972
 +stuttgart             MACH_S3                 S3                      3972
-+pogoplugv3            MACH_POGOPLUGV3         POGOPLUGV3              3973
-+mlp89626              MACH_MLP89626           MLP89626                3974
-+iomegahmndce          MACH_IOMEGAHMNDCE       IOMEGAHMNDCE            3975
-+pogoplugv3pci         MACH_POGOPLUGV3PCI      POGOPLUGV3PCI           3976
-+bntv250                       MACH_BNTV250            BNTV250                 3977
-+mx53_qseven           MACH_MX53_QSEVEN        MX53_QSEVEN             3978
-+gtl_it1100            MACH_GTL_IT1100         GTL_IT1100              3979
-+mx6q_sabresd          MACH_MX6Q_SABRESD       MX6Q_SABRESD            3980
-+mt4                   MACH_MT4                MT4                     3981
-+jumbo_d                       MACH_JUMBO_D            JUMBO_D                 3982
-+jumbo_i                       MACH_JUMBO_I            JUMBO_I                 3983
-+fs20_dmp              MACH_FS20_DMP           FS20_DMP                3984
-+dns320                        MACH_DNS320             DNS320                  3985
-+mx28bacos             MACH_MX28BACOS          MX28BACOS               3986
-+tl80                  MACH_TL80               TL80                    3987
-+polatis_nic_1001      MACH_POLATIS_NIC_1001   POLATIS_NIC_1001        3988
-+tely                  MACH_TELY               TELY                    3989
-+u8520                 MACH_U8520              U8520                   3990
-+manta                 MACH_MANTA              MANTA                   3991
+ pogoplugv3            MACH_POGOPLUGV3         POGOPLUGV3              3973
+ mlp89626              MACH_MLP89626           MLP89626                3974
+ iomegahmndce          MACH_IOMEGAHMNDCE       IOMEGAHMNDCE            3975
+@@ -1036,7 +3944,9 @@ polatis_nic_1001 MACH_POLATIS_NIC_1001   P
+ tely                  MACH_TELY               TELY                    3989
+ u8520                 MACH_U8520              U8520                   3990
+ manta                 MACH_MANTA              MANTA                   3991
 +spear1340_lcad                MACH_SPEAR_EM_S900      SPEAR_EM_S900           3992
 +spear1340_lcad                MACH_SPEAR_EM_S900      SPEAR_EM_S900           3992
-+mpq8064_cdp           MACH_MPQ8064_CDP        MPQ8064_CDP             3993
+ mpq8064_cdp           MACH_MPQ8064_CDP        MPQ8064_CDP             3993
 +mpq8064_hrd           MACH_MPQ8064_STB        MPQ8064_STB             3994
 +mpq8064_hrd           MACH_MPQ8064_STB        MPQ8064_STB             3994
-+mpq8064_dtv           MACH_MPQ8064_DTV        MPQ8064_DTV             3995
-+dm368som              MACH_DM368SOM           DM368SOM                3996
-+gprisb2                       MACH_GPRISB2            GPRISB2                 3997
-+chammid                       MACH_CHAMMID            CHAMMID                 3998
-+seoul2                        MACH_SEOUL2             SEOUL2                  3999
-+omap4_nooktablet      MACH_OMAP4_NOOKTABLET   OMAP4_NOOKTABLET        4000
-+aalto                 MACH_AALTO              AALTO                   4001
-+metro                 MACH_METRO              METRO                   4002
-+cydm3730              MACH_CYDM3730           CYDM3730                4003
-+tqma53                        MACH_TQMA53             TQMA53                  4004
-+msm7627a_qrd3         MACH_MSM7627A_QRD3      MSM7627A_QRD3           4005
-+mx28_canby            MACH_MX28_CANBY         MX28_CANBY              4006
-+tiger                 MACH_TIGER              TIGER                   4007
-+pcats_9307_type_a     MACH_PCATS_9307_TYPE_A  PCATS_9307_TYPE_A       4008
-+pcats_9307_type_o     MACH_PCATS_9307_TYPE_O  PCATS_9307_TYPE_O       4009
-+pcats_9307_type_r     MACH_PCATS_9307_TYPE_R  PCATS_9307_TYPE_R       4010
-+streamplug            MACH_STREAMPLUG         STREAMPLUG              4011
-+icechicken_dev                MACH_ICECHICKEN_DEV     ICECHICKEN_DEV          4012
-+hedgehog              MACH_HEDGEHOG           HEDGEHOG                4013
-+yusend_obc            MACH_YUSEND_OBC         YUSEND_OBC              4014
-+imxninja              MACH_IMXNINJA           IMXNINJA                4015
-+omap4_jarod           MACH_OMAP4_JAROD        OMAP4_JAROD             4016
-+eco5_pk                       MACH_ECO5_PK            ECO5_PK                 4017
-+qj2440                        MACH_QJ2440             QJ2440                  4018
-+mx6q_mercury          MACH_MX6Q_MERCURY       MX6Q_MERCURY            4019
-+cm6810                        MACH_CM6810             CM6810                  4020
-+omap4_torpedo         MACH_OMAP4_TORPEDO      OMAP4_TORPEDO           4021
-+nsa310                        MACH_NSA310             NSA310                  4022
-+tmx536                        MACH_TMX536             TMX536                  4023
-+ktt20                 MACH_KTT20              KTT20                   4024
-+dragonix              MACH_DRAGONIX           DRAGONIX                4025
-+lungching             MACH_LUNGCHING          LUNGCHING               4026
-+bulogics              MACH_BULOGICS           BULOGICS                4027
-+mx535_sx              MACH_MX535_SX           MX535_SX                4028
-+ngui3250              MACH_NGUI3250           NGUI3250                4029
-+salutec_dac           MACH_SALUTEC_DAC        SALUTEC_DAC             4030
-+loco                  MACH_LOCO               LOCO                    4031
-+ctera_plug_usi                MACH_CTERA_PLUG_USI     CTERA_PLUG_USI          4032
-+scepter                       MACH_SCEPTER            SCEPTER                 4033
-+sga                   MACH_SGA                SGA                     4034
-+p_81_j5                       MACH_P_81_J5            P_81_J5                 4035
-+p_81_o4                       MACH_P_81_O4            P_81_O4                 4036
-+msm8625_surf          MACH_MSM8625_SURF       MSM8625_SURF            4037
-+carallon_shark                MACH_CARALLON_SHARK     CARALLON_SHARK          4038
+ mpq8064_dtv           MACH_MPQ8064_DTV        MPQ8064_DTV             3995
+ dm368som              MACH_DM368SOM           DM368SOM                3996
+ gprisb2                       MACH_GPRISB2            GPRISB2                 3997
+@@ -1081,6 +3991,7 @@ p_81_j5                  MACH_P_81_J5            P_81_J5                 4035
+ p_81_o4                       MACH_P_81_O4            P_81_O4                 4036
+ msm8625_surf          MACH_MSM8625_SURF       MSM8625_SURF            4037
+ carallon_shark                MACH_CARALLON_SHARK     CARALLON_SHARK          4038
 +lsgc_icam             MACH_LSGCICAM           LSGCICAM                4039
 +lsgc_icam             MACH_LSGCICAM           LSGCICAM                4039
-+ordog                 MACH_ORDOG              ORDOG                   4040
-+puente_io             MACH_PUENTE_IO          PUENTE_IO               4041
-+msm8625_evb           MACH_MSM8625_EVB        MSM8625_EVB             4042
-+ev_am1707             MACH_EV_AM1707          EV_AM1707               4043
-+ev_am1707e2           MACH_EV_AM1707E2        EV_AM1707E2             4044
-+ev_am3517e2           MACH_EV_AM3517E2        EV_AM3517E2             4045
-+calabria              MACH_CALABRIA           CALABRIA                4046
-+ev_imx287             MACH_EV_IMX287          EV_IMX287               4047
-+erau                  MACH_ERAU               ERAU                    4048
-+sichuan                       MACH_SICHUAN            SICHUAN                 4049
+ ordog                 MACH_ORDOG              ORDOG                   4040
+ puente_io             MACH_PUENTE_IO          PUENTE_IO               4041
+ msm8625_evb           MACH_MSM8625_EVB        MSM8625_EVB             4042
+@@ -1091,6 +4002,7 @@ calabria         MACH_CALABRIA           CALABRIA                4046
+ ev_imx287             MACH_EV_IMX287          EV_IMX287               4047
+ erau                  MACH_ERAU               ERAU                    4048
+ sichuan                       MACH_SICHUAN            SICHUAN                 4049
 +sopdm                 MACH_WIRMA3             WIRMA3                  4050
 +sopdm                 MACH_WIRMA3             WIRMA3                  4050
-+davinci_da850         MACH_DAVINCI_DA850      DAVINCI_DA850           4051
-+omap138_trunarc               MACH_OMAP138_TRUNARC    OMAP138_TRUNARC         4052
-+bcm4761                       MACH_BCM4761            BCM4761                 4053
-+picasso_e2            MACH_PICASSO_E2         PICASSO_E2              4054
-+picasso_mf            MACH_PICASSO_MF         PICASSO_MF              4055
-+miro                  MACH_MIRO               MIRO                    4056
-+at91sam9g20ewon3      MACH_AT91SAM9G20EWON3   AT91SAM9G20EWON3        4057
-+yoyo                  MACH_YOYO               YOYO                    4058
-+windjkl                       MACH_WINDJKL            WINDJKL                 4059
-+monarudo              MACH_MONARUDO           MONARUDO                4060
-+batan                 MACH_BATAN              BATAN                   4061
-+tadao                 MACH_TADAO              TADAO                   4062
-+baso                  MACH_BASO               BASO                    4063
-+mahon                 MACH_MAHON              MAHON                   4064
-+villec2                       MACH_VILLEC2            VILLEC2                 4065
-+asi1230                       MACH_ASI1230            ASI1230                 4066
-+alaska                        MACH_ALASKA             ALASKA                  4067
-+swarco_shdsl2         MACH_SWARCO_SHDSL2      SWARCO_SHDSL2           4068
-+oxrtu                 MACH_OXRTU              OXRTU                   4069
-+omap5_panda           MACH_OMAP5_PANDA        OMAP5_PANDA             4070
+ davinci_da850         MACH_DAVINCI_DA850      DAVINCI_DA850           4051
+ omap138_trunarc               MACH_OMAP138_TRUNARC    OMAP138_TRUNARC         4052
+ bcm4761                       MACH_BCM4761            BCM4761                 4053
+@@ -1111,6 +4023,7 @@ alaska                   MACH_ALASKA             ALASKA                  4067
+ swarco_shdsl2         MACH_SWARCO_SHDSL2      SWARCO_SHDSL2           4068
+ oxrtu                 MACH_OXRTU              OXRTU                   4069
+ omap5_panda           MACH_OMAP5_PANDA        OMAP5_PANDA             4070
 +imx286                        MACH_MX28XDI            MX28XDI                 4071
 +imx286                        MACH_MX28XDI            MX28XDI                 4071
-+c8000                 MACH_C8000              C8000                   4072
-+bje_display3_5                MACH_BJE_DISPLAY3_5     BJE_DISPLAY3_5          4073
-+picomod7              MACH_PICOMOD7           PICOMOD7                4074
-+picocom5              MACH_PICOCOM5           PICOCOM5                4075
-+qblissa8              MACH_QBLISSA8           QBLISSA8                4076
-+armstonea8            MACH_ARMSTONEA8         ARMSTONEA8              4077
-+netdcu14              MACH_NETDCU14           NETDCU14                4078
-+at91sam9x5_epiphan    MACH_AT91SAM9X5_EPIPHAN AT91SAM9X5_EPIPHAN      4079
-+p2u                   MACH_P2U                P2U                     4080
-+doris                 MACH_DORIS              DORIS                   4081
-+j49                   MACH_J49                J49                     4082
-+vdss2e                        MACH_VDSS2E             VDSS2E                  4083
-+vc300                 MACH_VC300              VC300                   4084
-+ns115_pad_test                MACH_NS115_PAD_TEST     NS115_PAD_TEST          4085
-+ns115_pad_ref         MACH_NS115_PAD_REF      NS115_PAD_REF           4086
-+ns115_phone_test      MACH_NS115_PHONE_TEST   NS115_PHONE_TEST        4087
-+ns115_phone_ref               MACH_NS115_PHONE_REF    NS115_PHONE_REF         4088
-+golfc                 MACH_GOLFC              GOLFC                   4089
-+xerox_olympus         MACH_XEROX_OLYMPUS      XEROX_OLYMPUS           4090
-+mx6sl_arm2            MACH_MX6SL_ARM2         MX6SL_ARM2              4091
-+csb1701_csb1726               MACH_CSB1701_CSB1726    CSB1701_CSB1726         4092
-+at91sam9xeek          MACH_AT91SAM9XEEK       AT91SAM9XEEK            4093
-+ebv210                        MACH_EBV210             EBV210                  4094
-+msm7627a_qrd7         MACH_MSM7627A_QRD7      MSM7627A_QRD7           4095
-+svthin                        MACH_SVTHIN             SVTHIN                  4096
-+duovero                       MACH_DUOVERO            DUOVERO                 4097
-+chupacabra            MACH_CHUPACABRA         CHUPACABRA              4098
-+scorpion              MACH_SCORPION           SCORPION                4099
-+davinci_he_hmi10      MACH_DAVINCI_HE_HMI10   DAVINCI_HE_HMI10        4100
-+topkick                       MACH_TOPKICK            TOPKICK                 4101
-+m3_auguestrush                MACH_M3_AUGUESTRUSH     M3_AUGUESTRUSH          4102
-+ipc335x                       MACH_IPC335X            IPC335X                 4103
-+sun4i                 MACH_SUN4I              SUN4I                   4104
-+imx233_olinuxino      MACH_IMX233_OLINUXINO   IMX233_OLINUXINO        4105
-+k2_wl                 MACH_K2_WL              K2_WL                   4106
-+k2_ul                 MACH_K2_UL              K2_UL                   4107
-+k2_cl                 MACH_K2_CL              K2_CL                   4108
-+minbari_w             MACH_MINBARI_W          MINBARI_W               4109
-+minbari_m             MACH_MINBARI_M          MINBARI_M               4110
-+k035                  MACH_K035               K035                    4111
-+ariel                 MACH_ARIEL              ARIEL                   4112
-+arielsaarc            MACH_ARIELSAARC         ARIELSAARC              4113
-+arieldkb              MACH_ARIELDKB           ARIELDKB                4114
-+armadillo810          MACH_ARMADILLO810       ARMADILLO810            4115
-+tam335x                       MACH_TAM335X            TAM335X                 4116
-+grouper                       MACH_GROUPER            GROUPER                 4117
-+mpcsa21_9g20          MACH_MPCSA21_9G20       MPCSA21_9G20            4118
-+m6u_cpu                       MACH_M6U_CPU            M6U_CPU                 4119
-+davinci_dp10          MACH_DAVINCI_DP10       DAVINCI_DP10            4120
-+ginkgo                        MACH_GINKGO             GINKGO                  4121
-+cgt_qmx6              MACH_CGT_QMX6           CGT_QMX6                4122
-+profpga                       MACH_PROFPGA            PROFPGA                 4123
-+acfx100oc             MACH_ACFX100OC          ACFX100OC               4124
-+acfx100nb             MACH_ACFX100NB          ACFX100NB               4125
-+capricorn             MACH_CAPRICORN          CAPRICORN               4126
-+pisces                        MACH_PISCES             PISCES                  4127
-+aries                 MACH_ARIES              ARIES                   4128
-+cancer                        MACH_CANCER             CANCER                  4129
-+leo                   MACH_LEO                LEO                     4130
-+virgo                 MACH_VIRGO              VIRGO                   4131
-+sagittarius           MACH_SAGITTARIUS        SAGITTARIUS             4132
-+devil                 MACH_DEVIL              DEVIL                   4133
-+ballantines           MACH_BALLANTINES        BALLANTINES             4134
-+omap3_procerusvpu     MACH_OMAP3_PROCERUSVPU  OMAP3_PROCERUSVPU       4135
-+my27                  MACH_MY27               MY27                    4136
-+sun6i                 MACH_SUN6I              SUN6I                   4137
-+sun5i                 MACH_SUN5I              SUN5I                   4138
-+mx512_mx              MACH_MX512_MX           MX512_MX                4139
-+kzm9g                 MACH_KZM9G              KZM9G                   4140
-+vdstbn                        MACH_VDSTBN             VDSTBN                  4141
-+cfa10036              MACH_CFA10036           CFA10036                4142
-+cfa10049              MACH_CFA10049           CFA10049                4143
-+pcm051                        MACH_PCM051             PCM051                  4144
-+vybrid_vf7xx          MACH_VYBRID_VF7XX       VYBRID_VF7XX            4145
-+vybrid_vf6xx          MACH_VYBRID_VF6XX       VYBRID_VF6XX            4146
-+vybrid_vf5xx          MACH_VYBRID_VF5XX       VYBRID_VF5XX            4147
-+vybrid_vf4xx          MACH_VYBRID_VF4XX       VYBRID_VF4XX            4148
-+aria_g25              MACH_ARIA_G25           ARIA_G25                4149
-+bcm21553              MACH_BCM21553           BCM21553                4150
-+smdk5410              MACH_SMDK5410           SMDK5410                4151
-+lpc18xx                       MACH_LPC18XX            LPC18XX                 4152
-+oratisparty           MACH_ORATISPARTY        ORATISPARTY             4153
-+qseven                        MACH_QSEVEN             QSEVEN                  4154
-+gmv_generic           MACH_GMV_GENERIC        GMV_GENERIC             4155
-+th_link_eth           MACH_TH_LINK_ETH        TH_LINK_ETH             4156
-+tn_muninn             MACH_TN_MUNINN          TN_MUNINN               4157
-+rampage                       MACH_RAMPAGE            RAMPAGE                 4158
-+visstrim_mv10         MACH_VISSTRIM_MV10      VISSTRIM_MV10           4159
+ c8000                 MACH_C8000              C8000                   4072
+ bje_display3_5                MACH_BJE_DISPLAY3_5     BJE_DISPLAY3_5          4073
+ picomod7              MACH_PICOMOD7           PICOMOD7                4074
+@@ -1159,7 +4072,7 @@ tam335x                  MACH_TAM335X            TAM335X                 4116
+ grouper                       MACH_GROUPER            GROUPER                 4117
+ mpcsa21_9g20          MACH_MPCSA21_9G20       MPCSA21_9G20            4118
+ m6u_cpu                       MACH_M6U_CPU            M6U_CPU                 4119
+-davinci_dp10          MACH_DAVINCI_DP10       DAVINCI_DP10            4120
++davinci_dp7           MACH_DAVINCI_DP10       DAVINCI_DP10            4120
+ ginkgo                        MACH_GINKGO             GINKGO                  4121
+ cgt_qmx6              MACH_CGT_QMX6           CGT_QMX6                4122
+ profpga                       MACH_PROFPGA            PROFPGA                 4123
+@@ -1199,10 +4112,247 @@ th_link_eth           MACH_TH_LINK_ETH        TH_LINK_ET
+ tn_muninn             MACH_TN_MUNINN          TN_MUNINN               4157
+ rampage                       MACH_RAMPAGE            RAMPAGE                 4158
+ visstrim_mv10         MACH_VISSTRIM_MV10      VISSTRIM_MV10           4159
++monacotdu             MACH_MONACO_TDU         MONACO_TDU              4160
++monacoul              MACH_MONACO_UL          MONACO_UL               4161
++enrc2u                        MACH_ENRC2_U            ENRC2_U                 4162
++evitareul             MACH_EVITA_UL           EVITA_UL                4163
+ mx28_wilma            MACH_MX28_WILMA         MX28_WILMA              4164
++monacou                       MACH_MONACO_U           MONACO_U                4165
+ msm8625_ffa           MACH_MSM8625_FFA        MSM8625_FFA             4166
+ vpu101                        MACH_VPU101             VPU101                  4167
++operaul                       MACH_OPERA_UL           OPERA_UL                4168
+ baileys                       MACH_BAILEYS            BAILEYS                 4169
+ familybox             MACH_FAMILYBOX          FAMILYBOX               4170
+ ensemble_mx35         MACH_ENSEMBLE_MX35      ENSEMBLE_MX35           4171
+ sc_sps_1              MACH_SC_SPS_1           SC_SPS_1                4172
++ucsimply_sam9260      MACH_UCSIMPLY_SAM9260   UCSIMPLY_SAM9260        4173
++unicorn                       MACH_UNICORN            UNICORN                 4174
++m9g45a                        MACH_M9G45A             M9G45A                  4175
++mtwebif                       MACH_MTWEBIF            MTWEBIF                 4176
++playstone             MACH_PLAYSTONE          PLAYSTONE               4177
++chelsea                       MACH_CHELSEA            CHELSEA                 4178
++bayern                        MACH_BAYERN             BAYERN                  4179
++mitwo                 MACH_MITWO              MITWO                   4180
++mx25_noah             MACH_MX25_NOAH          MX25_NOAH               4181
++stm_b2020             MACH_STM_B2020          STM_B2020               4182
++annax_src             MACH_ANNAX_SRC          ANNAX_SRC               4183
++ionics_stratus                MACH_IONICS_STRATUS     IONICS_STRATUS          4184
++hugo                  MACH_HUGO               HUGO                    4185
++em300                 MACH_EM300              EM300                   4186
++mmp3_qseven           MACH_MMP3_QSEVEN        MMP3_QSEVEN             4187
++bosphorus2            MACH_BOSPHORUS2         BOSPHORUS2              4188
++tt2200                        MACH_TT2200             TT2200                  4189
++ocelot3                       MACH_OCELOT3            OCELOT3                 4190
++tek_cobra             MACH_TEK_COBRA          TEK_COBRA               4191
++protou                        MACH_PROTOU             PROTOU                  4192
++msm8625_evt           MACH_MSM8625_EVT        MSM8625_EVT             4193
++mx53_sellwood         MACH_MX53_SELLWOOD      MX53_SELLWOOD           4194
++somiq_am35            MACH_SOMIQ_AM35         SOMIQ_AM35              4195
++somiq_am37            MACH_SOMIQ_AM37         SOMIQ_AM37              4196
++k2_plc_cl             MACH_K2_PLC_CL          K2_PLC_CL               4197
++tc2                   MACH_TC2                TC2                     4198
++dulex_j                       MACH_DULEX_J            DULEX_J                 4199
++stm_b2044             MACH_STM_B2044          STM_B2044               4200
++deluxe_j              MACH_DELUXE_J           DELUXE_J                4201
++mango2443             MACH_MANGO2443          MANGO2443               4202
++cp2dcg                        MACH_CP2DCG             CP2DCG                  4203
++cp2dtg                        MACH_CP2DTG             CP2DTG                  4204
++cp2dug                        MACH_CP2DUG             CP2DUG                  4205
++var_som_am33          MACH_VAR_SOM_AM33       VAR_SOM_AM33            4206
++pepper                        MACH_PEPPER             PEPPER                  4207
++mango2450             MACH_MANGO2450          MANGO2450               4208
++valente_wx_c9         MACH_VALENTE_WX_C9      VALENTE_WX_C9           4209
++minitv                        MACH_MINITV             MINITV                  4210
++u8540                 MACH_U8540              U8540                   4211
++iv_atlas_i_z7e                MACH_IV_ATLAS_I_Z7E     IV_ATLAS_I_Z7E          4212
++mx53_csb1733          MACH_COGENT_CSB1733     COGENT_CSB1733          4213
++mach_type_sky         MACH_MACH_TYPE_SKY      MACH_TYPE_SKY           4214
++bluesky                       MACH_BLUESKY            BLUESKY                 4215
++ngrouter              MACH_NGROUTER           NGROUTER                4216
++mx53_denetim          MACH_MX53_DENETIM       MX53_DENETIM            4217
++opal                  MACH_OPAL               OPAL                    4218
++gnet_us3gref          MACH_GNET_US3GREF       GNET_US3GREF            4219
++gnet_nc3g             MACH_GNET_NC3G          GNET_NC3G               4220
++gnet_ge3g             MACH_GNET_GE3G          GNET_GE3G               4221
++adp2                  MACH_ADP2               ADP2                    4222
++tqma28                        MACH_TQMA28             TQMA28                  4223
++kacom3                        MACH_KACOM3             KACOM3                  4224
++rrhdemo                       MACH_RRHDEMO            RRHDEMO                 4225
++protodug              MACH_PROTODUG           PROTODUG                4226
++lago                  MACH_LAGO               LAGO                    4227
++ktt30                 MACH_KTT30              KTT30                   4228
++ts43xx                        MACH_TS43XX             TS43XX                  4229
++mx6q_denso            MACH_MX6Q_DENSO         MX6Q_DENSO              4230
++comsat_gsmumts8               MACH_COMSAT_GSMUMTS8    COMSAT_GSMUMTS8         4231
++dreamx                        MACH_DREAMX             DREAMX                  4232
++thunderstonem         MACH_THUNDERSTONEM      THUNDERSTONEM           4233
++yoyopad                       MACH_YOYOPAD            YOYOPAD                 4234
++yoyopatient           MACH_YOYOPATIENT        YOYOPATIENT             4235
++a10l                  MACH_A10L               A10L                    4236
++mq60                  MACH_MQ60               MQ60                    4237
++linkstation_lsql      MACH_LINKSTATION_LSQL   LINKSTATION_LSQL        4238
++am3703gateway         MACH_AM3703GATEWAY      AM3703GATEWAY           4239
++accipiter             MACH_ACCIPITER          ACCIPITER               4240
++e1853                 MACH_P1853              P1853                   4241
++magnidug              MACH_MAGNIDUG           MAGNIDUG                4242
++hydra                 MACH_HYDRA              HYDRA                   4243
++sun3i                 MACH_SUN3I              SUN3I                   4244
++stm_b2078             MACH_STM_B2078          STM_B2078               4245
++at91sam9263deskv2     MACH_AT91SAM9263DESKV2  AT91SAM9263DESKV2       4246
++deluxe_r              MACH_DELUXE_R           DELUXE_R                4247
++p_98_v                        MACH_P_98_V             P_98_V                  4248
++p_98_c                        MACH_P_98_C             P_98_C                  4249
++davinci_am18xx_omn    MACH_DAVINCI_AM18XX_OMN DAVINCI_AM18XX_OMN      4250
++socfpga_cyclone5      MACH_SOCFPGA_CYCLONE5   SOCFPGA_CYCLONE5        4251
++cabatuin              MACH_CABATUIN           CABATUIN                4252
++yoyopad_ft            MACH_YOYOPAD_FT         YOYOPAD_FT              4253
++dan2400evb            MACH_DAN2400EVB         DAN2400EVB              4254
++dan3400evb            MACH_DAN3400EVB         DAN3400EVB              4255
++edm_sf_imx6           MACH_EDM_SF_IMX6        EDM_SF_IMX6             4256
++edm_cf_imx6           MACH_EDM_CF_IMX6        EDM_CF_IMX6             4257
++vpos3xx                       MACH_VPOS3XX            VPOS3XX                 4258
++vulcano_9x5           MACH_VULCANO_9X5        VULCANO_9X5             4259
++spmp8000              MACH_SPMP8000           SPMP8000                4260
++catalina              MACH_CATALINA           CATALINA                4261
++rd88f5181l_fe         MACH_RD88F5181L_FE      RD88F5181L_FE           4262
++mx535_mx              MACH_MX535_MX           MX535_MX                4263
++armadillo840          MACH_ARMADILLO840       ARMADILLO840            4264
++spc9000baseboard      MACH_SPC9000BASEBOARD   SPC9000BASEBOARD        4265
++iris                  MACH_IRIS               IRIS                    4266
++protodcg              MACH_PROTODCG           PROTODCG                4267
++palmtree              MACH_PALMTREE           PALMTREE                4268
++novena                        MACH_NOVENA             NOVENA                  4269
++ma_um                 MACH_MA_UM              MA_UM                   4270
++ma_am                 MACH_MA_AM              MA_AM                   4271
++ems348                        MACH_EMS348             EMS348                  4272
++cm_fx6                        MACH_CM_FX6             CM_FX6                  4273
++arndale                       MACH_ARNDALE            ARNDALE                 4274
++q5xr5                 MACH_Q5XR5              Q5XR5                   4275
++willow                        MACH_WILLOW             WILLOW                  4276
++omap3621_odyv3                MACH_OMAP3621_ODYV3     OMAP3621_ODYV3          4277
++omapl138_presonus     MACH_OMAPL138_PRESONUS  OMAPL138_PRESONUS       4278
++dvf99                 MACH_DVF99              DVF99                   4279
++impression_j          MACH_IMPRESSION_J       IMPRESSION_J            4280
++qblissa9              MACH_QBLISSA9           QBLISSA9                4281
++robin_heliview10      MACH_ROBIN_HELIVIEW10   ROBIN_HELIVIEW10        4282
++sun7i                 MACH_SUN7I              SUN7I                   4283
++mx6q_hdmidongle               MACH_MX6Q_HDMIDONGLE    MX6Q_HDMIDONGLE         4284
++mx6_sid2              MACH_MX6_SID2           MX6_SID2                4285
++helios_v3             MACH_HELIOS_V3          HELIOS_V3               4286
++helios_v4             MACH_HELIOS_V4          HELIOS_V4               4287
++q7_imx6                       MACH_Q7_IMX6            Q7_IMX6                 4288
++odroidx                       MACH_ODROIDX            ODROIDX                 4289
++robpro                        MACH_ROBPRO             ROBPRO                  4290
++research59if_mk1      MACH_RESEARCH59IF_MK1   RESEARCH59IF_MK1        4291
++bobsleigh             MACH_BOBSLEIGH          BOBSLEIGH               4292
++dcshgwt3              MACH_DCSHGWT3           DCSHGWT3                4293
++gld1018                       MACH_GLD1018            GLD1018                 4294
++ev10                  MACH_EV10               EV10                    4295
++nitrogen6x            MACH_NITROGEN6X         NITROGEN6X              4296
++p_107_bb              MACH_P_107_BB           P_107_BB                4297
++evita_utl             MACH_EVITA_UTL          EVITA_UTL               4298
++falconwing            MACH_FALCONWING         FALCONWING              4299
++dct3                  MACH_DCT3               DCT3                    4300
++cpx2e_cell            MACH_CPX2E_CELL         CPX2E_CELL              4301
++amiro                 MACH_AMIRO              AMIRO                   4302
++mx6q_brassboard               MACH_MX6Q_BRASSBOARD    MX6Q_BRASSBOARD         4303
++dalmore                       MACH_DALMORE            DALMORE                 4304
++omap3_portal7cp               MACH_OMAP3_PORTAL7CP    OMAP3_PORTAL7CP         4305
++tegra_pluto           MACH_TEGRA_PLUTO        TEGRA_PLUTO             4306
++mx6sl_evk             MACH_MX6SL_EVK          MX6SL_EVK               4307
++m7                    MACH_M7                 M7                      4308
++pxm2                  MACH_PXM2               PXM2                    4309
++haba_knx_lite         MACH_HABA_KNX_LITE      HABA_KNX_LITE           4310
++tai                   MACH_TAI                TAI                     4311
++prototd                       MACH_PROTOTD            PROTOTD                 4312
++dst_tonto             MACH_DST_TONTO          DST_TONTO               4313
++draco                 MACH_DRACO              DRACO                   4314
++dxr2                  MACH_DXR2               DXR2                    4315
++rut                   MACH_RUT                RUT                     4316
++am180x_wsc            MACH_AM180X_WSC         AM180X_WSC              4317
++deluxe_u              MACH_DELUXE_U           DELUXE_U                4318
++deluxe_ul             MACH_DELUXE_UL          DELUXE_UL               4319
++at91sam9260medths     MACH_AT91SAM9260MEDTHS  AT91SAM9260MEDTHS       4320
++matrix516             MACH_MATRIX516          MATRIX516               4321
++vid401x                       MACH_VID401X            VID401X                 4322
++helios_v5             MACH_HELIOS_V5          HELIOS_V5               4323
++playpaq2              MACH_PLAYPAQ2           PLAYPAQ2                4324
++igam                  MACH_IGAM               IGAM                    4325
++amico_i                       MACH_AMICO_I            AMICO_I                 4326
++amico_e                       MACH_AMICO_E            AMICO_E                 4327
++sentient_mm3_ck               MACH_SENTIENT_MM3_CK    SENTIENT_MM3_CK         4328
++smx6                  MACH_SMX6               SMX6                    4329
++pango                 MACH_PANGO              PANGO                   4330
++ns115_stick           MACH_NS115_STICK        NS115_STICK             4331
++bctrm3                        MACH_BCTRM3             BCTRM3                  4332
++doctorws              MACH_DOCTORWS           DOCTORWS                4333
++m2601                 MACH_M2601              M2601                   4334
++gco_mgmtt             MACH_GRIDCO_TRINITY     GRIDCO_TRINITY          4335
++pc73032                       MACH_PC3032             PC3032                  4336
++vgg1111                       MACH_VGG1111            VGG1111                 4337
++countach              MACH_COUNTACH           COUNTACH                4338
++visstrim_sm20         MACH_VISSTRIM_SM20      VISSTRIM_SM20           4339
++a639                  MACH_A639               A639                    4340
++spacemonkey           MACH_SPACEMONKEY        SPACEMONKEY             4341
++zpdu_stamp            MACH_ZPDU_STAMP         ZPDU_STAMP              4342
++htc_g7_clone          MACH_HTC_G7_CLONE       HTC_G7_CLONE            4343
++ft2080_corvus         MACH_FT2080_CORVUS      FT2080_CORVUS           4344
++fisland                       MACH_FISLAND            FISLAND                 4345
++zpdu                  MACH_ZPDU               ZPDU                    4346
++urt                   MACH_URT                URT                     4347
++conti_ovip            MACH_CONTI_OVIP         CONTI_OVIP              4348
++omapl138_nagra                MACH_OMAPL138_NAGRA     OMAPL138_NAGRA          4349
++da850_at3kp1          MACH_DA850_AT3KP1       DA850_AT3KP1            4350
++da850_at3kp2          MACH_DA850_AT3KP2       DA850_AT3KP2            4351
++surma                 MACH_SURMA              SURMA                   4352
++stm_b2092             MACH_STM_B2092          STM_B2092               4353
++mx535_ycr             MACH_MX535_YCR          MX535_YCR               4354
++m7_wl                 MACH_M7_WL              M7_WL                   4355
++m7_u                  MACH_M7_U               M7_U                    4356
++omap3_stndt_evm               MACH_OMAP3_STNDT_EVM    OMAP3_STNDT_EVM         4357
++m7_wlv                        MACH_M7_WLV             M7_WLV                  4358
++xam3517                       MACH_XAM3517            XAM3517                 4359
++a220                  MACH_A220               A220                    4360
++aclima_odie           MACH_ACLIMA_ODIE        ACLIMA_ODIE             4361
++vibble                        MACH_VIBBLE             VIBBLE                  4362
++k2_u                  MACH_K2_U               K2_U                    4363
++mx53_egf              MACH_MX53_EGF           MX53_EGF                4364
++novpek_imx53          MACH_NOVPEK_IMX53       NOVPEK_IMX53            4365
++novpek_imx6x          MACH_NOVPEK_IMX6X       NOVPEK_IMX6X            4366
++mx25_smartbox         MACH_MX25_SMARTBOX      MX25_SMARTBOX           4367
++eicg6410              MACH_EICG6410           EICG6410                4368
++picasso_e3            MACH_PICASSO_E3         PICASSO_E3              4369
++motonavigator         MACH_MOTONAVIGATOR      MOTONAVIGATOR           4370
++varioconnect2         MACH_VARIOCONNECT2      VARIOCONNECT2           4371
++deluxe_tw             MACH_DELUXE_TW          DELUXE_TW               4372
++ref_brd                       MACH_VISCONTI3          VISCONTI3               4373
++kore3                 MACH_KORE3              KORE3                   4374
++mx6s_drs              MACH_MX6S_DRS           MX6S_DRS                4375
++cmimx6                        MACH_CMIMX6             CMIMX6                  4376
++roth                  MACH_ROTH               ROTH                    4377
++eq4ux                 MACH_EQ4UX              EQ4UX                   4378
++x1plus                        MACH_X1PLUS             X1PLUS                  4379
++modimx27              MACH_MODIMX27           MODIMX27                4380
++videon_hduac          MACH_VIDEON_HDUAC       VIDEON_HDUAC            4381
++blackbird             MACH_BLACKBIRD          BLACKBIRD               4382
++runmaster             MACH_RUNMASTER          RUNMASTER               4383
++ceres                 MACH_CERES              CERES                   4384
++nad435                        MACH_NAD435             NAD435                  4385
++ns115_proto_type      MACH_NS115_PROTO_TYPE   NS115_PROTO_TYPE        4386
++fs20_vcc              MACH_FS20_VCC           FS20_VCC                4387
++meson6tv_ref          MACH_MESON6TV           MESON6TV                4388
++meson6tv_skt          MACH_MESON6TV_SKT       MESON6TV_SKT            4389
++keystone              MACH_KEYSTONE           KEYSTONE                4390
++pcm052                        MACH_PCM052             PCM052                  4391
++rainbowg15_q7         MACH_TYPE               TYPE                    4392
++qrd_skud_prime                MACH_QRD_SKUD_PRIME     QRD_SKUD_PRIME          4393
++mx6_rainbow           MACH_RAINBOWG15         RAINBOWG15              4394
++guf_santaro           MACH_GUF_SANTARO        GUF_SANTARO             4395
++sheepshead            MACH_SHEEPSHEAD         SHEEPSHEAD              4396
++mx6_iwg15m_mxm                MACH_MX6_IWG15M_MXM     MX6_IWG15M_MXM          4397
++mx6_iwg15m_q7         MACH_MX6_IWG15M_Q7      MX6_IWG15M_Q7           4398
++at91sam9263if8mic     MACH_AT91SAM9263IF8MIC  AT91SAM9263IF8MIC       4399
++ex                    MACH_EXCEL              EXCEL                   4400
++marcopolo             MACH_MARCOPOLO          MARCOPOLO               4401
++mx535_sdcr            MACH_MX535_SDCR         MX535_SDCR              4402
++
index fb16e2aa627e7253127ba6f75c8430f2780a8831..26bb9b8b2995cfc04a5ec95ef90ce1b796ac2a61 100644 (file)
@@ -29,29 +29,33 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
 
 --- a/arch/arm/include/asm/smp_twd.h
 +++ b/arch/arm/include/asm/smp_twd.h
 
 --- a/arch/arm/include/asm/smp_twd.h
 +++ b/arch/arm/include/asm/smp_twd.h
-@@ -24,5 +24,6 @@ extern void __iomem *twd_base;
+@@ -33,6 +33,7 @@ struct twd_local_timer name __initdata =
+ };
  
  
- void twd_timer_setup(struct clock_event_device *);
- void twd_timer_stop(struct clock_event_device *);
+ int twd_local_timer_register(struct twd_local_timer *);
 +unsigned long twd_timer_get_rate(void);
  
 +unsigned long twd_timer_get_rate(void);
  
- #endif
+ #ifdef CONFIG_HAVE_ARM_TWD
+ void twd_local_timer_of_register(void);
 --- a/arch/arm/kernel/smp_twd.c
 +++ b/arch/arm/kernel/smp_twd.c
 --- a/arch/arm/kernel/smp_twd.c
 +++ b/arch/arm/kernel/smp_twd.c
-@@ -268,3 +268,10 @@ void __cpuinit twd_timer_setup(struct cl
-                                       0xf, 0xffffffff);
-       enable_percpu_irq(clk->irq, 0);
+@@ -352,6 +352,13 @@ int __init twd_local_timer_register(stru
+       return twd_local_timer_common_register();
  }
  }
-+
 +/* Needed by mpcore_wdt */
 +unsigned long twd_timer_get_rate(void)
 +{
 +      return twd_timer_rate;
 +}
 +EXPORT_SYMBOL_GPL(twd_timer_get_rate);
 +/* Needed by mpcore_wdt */
 +unsigned long twd_timer_get_rate(void)
 +{
 +      return twd_timer_rate;
 +}
 +EXPORT_SYMBOL_GPL(twd_timer_get_rate);
++
+ #ifdef CONFIG_OF
+ const static struct of_device_id twd_of_match[] __initconst = {
+       { .compatible = "arm,cortex-a9-twd-timer",      },
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
-@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct
+@@ -102,9 +102,7 @@ static void mpcore_wdt_keepalive(struct
  
        spin_lock(&wdt_lock);
        /* Assume prescale is set to 256 */
  
        spin_lock(&wdt_lock);
        /* Assume prescale is set to 256 */
index fa261ce6482fbb07dc5c7043ba76655957c1d219..93ac9395023cfb818a9e221460864a6a423ce747 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
 
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
 
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
-@@ -233,7 +233,8 @@ static long mpcore_wdt_ioctl(struct file
+@@ -236,7 +236,8 @@ static long mpcore_wdt_ioctl(struct file
        if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
                return -ENOTTY;
  
        if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
                return -ENOTTY;
  
index 009092376fb506d3a2b29390f28b9b3ecaf04f03..dd9f217309afbfb942d6762944cb2ba25a2442f1 100644 (file)
@@ -20,12 +20,12 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
 +#define TWD_WDOG_CONTROL_TIMER_MODE   (0 << 3)
 +#define TWD_WDOG_CONTROL_WATCHDOG_MODE        (1 << 3)
 +
 +#define TWD_WDOG_CONTROL_TIMER_MODE   (0 << 3)
 +#define TWD_WDOG_CONTROL_WATCHDOG_MODE        (1 << 3)
 +
- struct clock_event_device;
+ #include <linux/ioport.h>
  
  
- extern void __iomem *twd_base;
+ struct twd_local_timer {
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
-@@ -118,18 +118,25 @@ static void mpcore_wdt_stop(struct mpcor
+@@ -121,18 +121,25 @@ static void mpcore_wdt_stop(struct mpcor
  
  static void mpcore_wdt_start(struct mpcore_wdt *wdt)
  {
  
  static void mpcore_wdt_start(struct mpcore_wdt *wdt)
  {