Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fc3eb81 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/board' into next/boards 

* imx/board: (4 commits)
  Enable 32 bit flash support for iMX21ADS board
  ARM: mx31pdk: Add MC13783 RTC support
  iomux-mx25: configuration to support CSPI3 on CSI pins
  MX1:apf9328: Add i2c support

Updated to v3.2-rc6, conflicts:
	arch/arm/kernel/setup.c
parents e006d656 ee9ba0f2

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -220,8 +220,9 @@ config NEED_MACH_MEMORY_H 
	  be avoided when possible.



config PHYS_OFFSET

	hex "Physical address of main memory"

	hex "Physical address of main memory" if MMU

	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H

	default DRAM_BASE if !MMU

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.

arch/arm/configs/imx_v4_v5_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ CONFIG_MTD_CFI=y 
CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set

# CONFIG_MTD_CFI_I2 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

arch/arm/include/asm/unwind.h

+4 −12
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ enum unwind_reason_code { 
};



struct unwind_idx {

	unsigned long addr;

	unsigned long addr_offset;

	unsigned long insn;

};



struct unwind_table {

	struct list_head list;

	struct unwind_idx *start;

	struct unwind_idx *stop;

	const struct unwind_idx *start;

	const struct unwind_idx *origin;

	const struct unwind_idx *stop;

	unsigned long begin_addr;

	unsigned long end_addr;

};
@@ -49,15 +50,6 @@ extern struct unwind_table *unwind_table_add(unsigned long start, 
extern void unwind_table_del(struct unwind_table *tab);

extern void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk);



#ifdef CONFIG_ARM_UNWIND

extern int __init unwind_init(void);

#else

static inline int __init unwind_init(void)

{

	return 0;

}

#endif



#endif	/* !__ASSEMBLY__ */



#ifdef CONFIG_ARM_UNWIND