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

Commit 6540afea authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup 

Nicolas Ferre <nicolas.ferre@atmel.com> writes:
 First batch of AT91 cleanup for 3.5 kernel.
 - The biggest improvement of this series is the ability to compile several
   AT91 SoCs in one kernel image.
   For now on it's limited to the DT-enabled boards but we can compile all
   the core together.
 - The Kconfig series is stacked before other patches as it is simple and
   non-intrusive. Its goal is to remove too restrictive dependencies on
   SoC names. This will allow to add support for newer SoC seamlessly.
 - Some very "cosmetic" Kconfig changes are also added (entry names,
   comments, etc.).

* tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91

: (19 commits)
  ARM: at91: add defconfig for device tree
  ARM: at91/dt: do not specify the board any more
  ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support
  ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select
  ARM: at91: pm select memory controler at runtime
  ARM: at91: move at91_init_leds to board init
  ARM: at91: do not pin mux the UARTs in init_early
  ARM: at91: drop at91_set_serial_console
  ARM: at91: uncompress: autodetect the uart to use
  ARM: at91: uncompress Store UART address in a variable
  hwrng: Kconfig: remove dependency for atmel-rng driver
  Input: Kconfig: remove dependency for atmel_tsadcc driver
  rtc: Kconfig: remove dependency for AT91 rtc driver
  ARM: at91/Kconfig: website link for AT91SAM9G20-EK
  ARM: at91/Kconfig: add AT91SAM9x5 family to AT91_EARLY_DBGU0 entry
  ARM: at91/Kconfig: add clarifications to AT91SAM9M10G45-EK entry
  ARM: at91/Kconfig: add comment to at91sam9x5 family entry
  ARM: at91/Kconfig: change at91sam9g45 entry
  ARM: at91: change AT91 Kconfig entry comment

Also updates the cleanup branch to v3.4-rc3.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 17d2f847 39ecc143

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+7 −7
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -12,8 +12,8 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -27,7 +27,7 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -40,7 +40,7 @@ Description: 
		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -51,7 +51,7 @@ Description: 
		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Documentation/ABI/testing/sysfs-block-rssd

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:           /sys/block/rssd*/registers

Date:           March 2012

KernelVersion:  3.3

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps below driver information and

                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Allocated

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:   This is a read-only file. Indicates the status of the device.

Documentation/ABI/testing/sysfs-cfq-target-latency

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/sys/block/<device>/iosched/target_latency

Date:		March 2012

contact:	Tao Ma <boyu.mt@taobao.com>

Description:

		The /sys/block/<device>/iosched/target_latency only exists

		when the user sets cfq to /sys/block/<device>/scheduler.

		It contains an estimated latency time for the cfq. cfq will

		use it to calculate the time slice used for every task.

Documentation/cgroups/memory.txt

+2 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April) 


Features:

 - accounting anonymous pages, file caches, swap caches usage and limiting them.

 - private LRU and reclaim routine. (system's global LRU and private LRU

   work independently from each other)

 - pages are linked to per-memcg LRU exclusively, and there is no global LRU.

 - optionally, memory+swap usage can be accounted and limited.

 - hierarchical accounting

 - soft limit
@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup. 
2.2.1 Accounting details



All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.

Some pages which are never reclaimable and will not be on the global LRU

Some pages which are never reclaimable and will not be on the LRU

are not accounted. We just account pages under usual VM management.



RSS pages are accounted at page_fault unless they've already been accounted

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -531,3 +531,11 @@ Why: There appear to be no production users of the get_robust_list syscall, 
	of ASLR. It was only ever intended for debugging, so it should be

	removed.

Who:	Kees Cook <keescook@chromium.org>



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



What:	setitimer accepts user NULL pointer (value)

When:	3.6

Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

	violates the spec.

Who:	Sasikantha Babu <sasikanth.v19@gmail.com>