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

Commit b3fdfc1b authored by Chris Zankel's avatar Chris Zankel
Browse files

Merge tag 'xtensa-for-next-20140221-1' into for_next 



Xtensa fixes for 3.14:
- allow booting xtfpga on boards with new uBoot and >128MBytes memory;
- drop nonexistent GPIO32 support from fsf variant;
- don't select USE_GENERIC_SMP_HELPERS;
- enable common clock framework support, set up ethoc clock on xtfpga;
- wire up sched_setattr and sched_getattr syscalls.

Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parents c0e50d41 f63b6d75

.gitignore

+3 −0
Original line number Original line Diff line number Diff line
@@ -92,3 +92,6 @@ extra_certificates 
signing_key.priv

signing_key.priv

signing_key.x509

signing_key.x509

x509.genkey

x509.genkey



# Kconfig presets

all.config

CREDITS

+2 −2
Original line number Original line Diff line number Diff line
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg 
S: Germany

S: Germany





N: Jean Delvare

N: Jean Delvare

E: khali@linux-fr.org

E: jdelvare@suse.de

W: http://khali.linux-fr.org/

W: http://jdelvare.nerim.net/

D: Several hardware monitoring drivers

D: Several hardware monitoring drivers

S: France

S: France

Documentation/00-INDEX

+20 −4
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ DMA-ISA-LPC.txt 
	- How to do DMA with ISA (and LPC) devices.

	- How to do DMA with ISA (and LPC) devices.

DMA-attributes.txt

DMA-attributes.txt

	- listing of the various possible attributes a DMA region can have

	- listing of the various possible attributes a DMA region can have

dmatest.txt

	- how to compile, configure and use the dmatest system.

DocBook/

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

	- directory with DocBook templates etc. for kernel documentation.

EDID/

EDID/
@@ -77,6 +79,8 @@ arm/ 
	- directory with info about Linux on the ARM architecture.

	- directory with info about Linux on the ARM architecture.

arm64/

arm64/

	- directory with info about Linux on the 64 bit ARM architecture.

	- directory with info about Linux on the 64 bit ARM architecture.

assoc_array.txt

	- generic associative array intro.

atomic_ops.txt

atomic_ops.txt

	- semantics and behavior of atomic and bitmask operations.

	- semantics and behavior of atomic and bitmask operations.

auxdisplay/

auxdisplay/
@@ -87,6 +91,8 @@ bad_memory.txt 
	- how to use kernel parameters to exclude bad RAM regions.

	- how to use kernel parameters to exclude bad RAM regions.

basic_profiling.txt

basic_profiling.txt

	- basic instructions for those who wants to profile Linux kernel.

	- basic instructions for those who wants to profile Linux kernel.

bcache.txt

	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.

binfmt_misc.txt

binfmt_misc.txt

	- info on the kernel support for extra binary formats.

	- info on the kernel support for extra binary formats.

blackfin/

blackfin/
@@ -171,6 +177,8 @@ early-userspace/ 
	- info about initramfs, klibc, and userspace early during boot.

	- info about initramfs, klibc, and userspace early during boot.

edac.txt

edac.txt

	- information on EDAC - Error Detection And Correction

	- information on EDAC - Error Detection And Correction

efi-stub.txt

	- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.

eisa.txt

eisa.txt

	- info on EISA bus support.

	- info on EISA bus support.

email-clients.txt

email-clients.txt
@@ -195,8 +203,8 @@ futex-requeue-pi.txt 
	- info on requeueing of tasks from a non-PI futex to a PI futex

	- info on requeueing of tasks from a non-PI futex to a PI futex

gcov.txt

gcov.txt

	- use of GCC's coverage testing tool "gcov" with the Linux kernel

	- use of GCC's coverage testing tool "gcov" with the Linux kernel

gpio.txt

gpio/

	- overview of GPIO (General Purpose Input/Output) access conventions.

	- gpio related documentation

hid/

hid/

	- directory with information on human interface devices

	- directory with information on human interface devices

highuid.txt

highuid.txt
@@ -255,6 +263,8 @@ kernel-docs.txt 
	- listing of various WWW + books that document kernel internals.

	- listing of various WWW + books that document kernel internals.

kernel-parameters.txt

kernel-parameters.txt

	- summary listing of command line / boot prompt args for the kernel.

	- summary listing of command line / boot prompt args for the kernel.

kernel-per-CPU-kthreads.txt

	- List of all per-CPU kthreads and how they introduce jitter.

kmemcheck.txt

kmemcheck.txt

	- info on dynamic checker that detects uses of uninitialized memory.

	- info on dynamic checker that detects uses of uninitialized memory.

kmemleak.txt

kmemleak.txt
@@ -299,8 +309,6 @@ memory-devices/ 
	- directory with info on parts like the Texas Instruments EMIF driver

	- directory with info on parts like the Texas Instruments EMIF driver

memory-hotplug.txt

memory-hotplug.txt

	- Hotpluggable memory support, how to use and current status.

	- Hotpluggable memory support, how to use and current status.

memory.txt

	- info on typical Linux memory problems.

metag/

metag/

	- directory with info about Linux on Meta architecture.

	- directory with info about Linux on Meta architecture.

mips/

mips/
@@ -311,6 +319,8 @@ mmc/ 
	- directory with info about the MMC subsystem

	- directory with info about the MMC subsystem

mn10300/

mn10300/

	- directory with info about the mn10300 architecture port

	- directory with info about the mn10300 architecture port

module-signing.txt

	- Kernel module signing for increased security when loading modules.

mtd/

mtd/

	- directory with info about memory technology devices (flash)

	- directory with info about memory technology devices (flash)

mono.txt

mono.txt
@@ -343,6 +353,8 @@ pcmcia/ 
	- info on the Linux PCMCIA driver.

	- info on the Linux PCMCIA driver.

percpu-rw-semaphore.txt

percpu-rw-semaphore.txt

	- RCU based read-write semaphore optimized for locking for reading

	- RCU based read-write semaphore optimized for locking for reading

phy.txt

	- Description of the generic PHY framework.

pi-futex.txt

pi-futex.txt

	- documentation on lightweight priority inheritance futexes.

	- documentation on lightweight priority inheritance futexes.

pinctrl.txt

pinctrl.txt
@@ -431,6 +443,8 @@ sysrq.txt 
	- info on the magic SysRq key.

	- info on the magic SysRq key.

target/

target/

	- directory with info on generating TCM v4 fabric .ko modules

	- directory with info on generating TCM v4 fabric .ko modules

this_cpu_ops.txt

	- List rationale behind and the way to use this_cpu operations.

thermal/

thermal/

	- directory with information on managing thermal issues (CPU/temp)

	- directory with information on managing thermal issues (CPU/temp)

trace/

trace/
@@ -469,6 +483,8 @@ wimax/ 
	- directory with info about Intel Wireless Wimax Connections

	- directory with info about Intel Wireless Wimax Connections

workqueue.txt

workqueue.txt

	- information on the Concurrency Managed Workqueue implementation

	- information on the Concurrency Managed Workqueue implementation

ww-mutex-design.txt

	- Intro to Mutex wait/would deadlock handling.s

x86/x86_64/

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

xtensa/

xtensa/

Documentation/ABI/testing/configfs-usb-gadget

+6 −6
Original line number Original line Diff line number Diff line 
What:		/config/usb-gadget

What:		/config/usb-gadget

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:

		This group contains sub-groups corresponding to created

		This group contains sub-groups corresponding to created

		USB gadgets.

		USB gadgets.





What:		/config/usb-gadget/gadget

What:		/config/usb-gadget/gadget

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:





		The attributes of a gadget:

		The attributes of a gadget:
@@ -27,7 +27,7 @@ Description: 




What:		/config/usb-gadget/gadget/configs

What:		/config/usb-gadget/gadget/configs

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:

		This group contains a USB gadget's configurations

		This group contains a USB gadget's configurations
@@ -58,20 +58,20 @@ Description: 




What:		/config/usb-gadget/gadget/functions

What:		/config/usb-gadget/gadget/functions

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:

		This group contains functions available to this USB gadget.

		This group contains functions available to this USB gadget.





What:		/config/usb-gadget/gadget/strings

What:		/config/usb-gadget/gadget/strings

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:

		This group contains subdirectories for language-specific

		This group contains subdirectories for language-specific

		strings for this gadget.

		strings for this gadget.





What:		/config/usb-gadget/gadget/strings/language

What:		/config/usb-gadget/gadget/strings/language

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:

		The attributes:

		The attributes:

Documentation/ABI/testing/configfs-usb-gadget-acm

+1 −1
Original line number Original line Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/acm.name

What:		/config/usb-gadget/gadget/functions/acm.name

Date:		Jun 2013

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

Description:





		This item contains just one readonly attribute: port_num.

		This item contains just one readonly attribute: port_num.