Skip to content

Commit

Permalink
Merge 3.15-rc6 into driver-core-next
Browse files Browse the repository at this point in the history
We want the kernfs fixes in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh committed May 23, 2014
2 parents d35cc56 + 4b660a7 commit cbfef53
Show file tree
Hide file tree
Showing 724 changed files with 8,053 additions and 4,798 deletions.
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-bus-pci
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Description:

What: /sys/bus/pci/devices/.../vpd
Date: February 2008
Contact: Ben Hutchings <[email protected]>
Contact: Ben Hutchings <[email protected]>
Description:
A file named vpd in a device directory will be a
binary file containing the Vital Product Data for the
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/arm/arch_timer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ to deliver its interrupts via SPIs.

- clock-frequency : The frequency of the main counter, in Hz. Optional.

- always-on : a boolean property. If present, the timer is powered through an
always-on power domain, therefore it never loses context.

Example:

timer {
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/ata/apm-xgene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Required properties:
* "sata-phy" for the SATA 6.0Gbps PHY

Optional properties:
- dma-coherent : Present if dma operations are coherent
- status : Shall be "ok" if enabled or "disabled" if disabled.
Default is "ok".

Expand Down Expand Up @@ -55,6 +56,7 @@ Example:
<0x0 0x1f22e000 0x0 0x1000>,
<0x0 0x1f227000 0x0 0x1000>;
interrupts = <0x0 0x87 0x4>;
dma-coherent;
status = "ok";
clocks = <&sataclk 0>;
phys = <&phy2 0>;
Expand All @@ -69,6 +71,7 @@ Example:
<0x0 0x1f23e000 0x0 0x1000>,
<0x0 0x1f237000 0x0 0x1000>;
interrupts = <0x0 0x88 0x4>;
dma-coherent;
status = "ok";
clocks = <&sataclk 0>;
phys = <&phy3 0>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/at91-clock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Required properties for PMC node:
- interrupt-controller : tell that the PMC is an interrupt controller.
- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
and reflect the bit position in the PMC_ER/DR/SR registers.
You can use the dt macros defined in dt-bindings/clk/at91.h.
You can use the dt macros defined in dt-bindings/clock/at91.h.
0 (AT91_PMC_MOSCS) -> main oscillator ready
1 (AT91_PMC_LOCKA) -> PLL A ready
2 (AT91_PMC_LOCKB) -> PLL B ready
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Example
clock-output-names =
"tpu0", "mmcif1", "sdhi3", "sdhi2",
"sdhi1", "sdhi0", "mmcif0";
renesas,clock-indices = <
clock-indices = <
R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
R8A7790_CLK_MMCIF0
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/dma/ti-edma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ edma: edma@49000000 {
dma-channels = <64>;
ti,edma-regions = <4>;
ti,edma-slots = <256>;
ti,edma-xbar-event-map = <1 12
2 13>;
ti,edma-xbar-event-map = /bits/ 16 <1 12
2 13>;
};
12 changes: 10 additions & 2 deletions Documentation/devicetree/bindings/net/arc_emac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ Required properties:
- compatible: Should be "snps,arc-emac"
- reg: Address and length of the register set for the device
- interrupts: Should contain the EMAC interrupts
- clock-frequency: CPU frequency. It is needed to calculate and set polling
period of EMAC.
- max-speed: see ethernet.txt file in the same directory.
- phy: see ethernet.txt file in the same directory.

Clock handling:
The clock frequency is needed to calculate and set polling period of EMAC.
It must be provided by one of:
- clock-frequency: CPU frequency.
- clocks: reference to the clock supplying the EMAC.

Child nodes of the driver are the individual PHY devices connected to the
MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.

Expand All @@ -19,7 +23,11 @@ Examples:
reg = <0xc0fc2000 0x3c>;
interrupts = <6>;
mac-address = [ 00 11 22 33 44 55 ];

clock-frequency = <80000000>;
/* or */
clocks = <&emac_clock>;

max-speed = <100>;
phy = <&phy0>;

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/socfpga-dwmac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 {
interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
clocks = <&emac_0_clk>;
clocks-names = "stmmaceth";
clock-names = "stmmaceth";
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/stmmac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Optional properties:
- max-frame-size: See ethernet.txt file in the same directory
- clocks: If present, the first clock should be the GMAC main clock,
further clocks may be specified in derived bindings.
- clocks-names: One name for each entry in the clocks property, the
- clock-names: One name for each entry in the clocks property, the
first one should be "stmmaceth".

Examples:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Example:
reg = <0xfe61f080 0x4>;
reg-names = "irqmux";
interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
interrupts-names = "irqmux";
interrupt-names = "irqmux";
ranges = <0 0xfe610000 0x5000>;

PIO0: gpio@fe610000 {
Expand Down Expand Up @@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{
interrupt-parent = <&PIO3>;
#interrupt-cells = <2>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */
interrupts-names = "card-detect";
interrupt-names = "card-detect";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 {
reg = <0x100000 0x3000>;
reg-names "mpu";
interrupts = <82>, <83>;
interrupts-names = "tx", "rx";
interrupt-names = "tx", "rx";
op-mode = <0>; /* MCASP_IIS_MODE */
tdm-slots = <2>;
serial-dir = <
Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ Required properties:
"ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)

- reg - <int> - I2C slave address
- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
DVDD-supply : power supplies for the device as covered in
Documentation/devicetree/bindings/regulator/regulator.txt


Optional properties:
Expand All @@ -24,9 +27,6 @@ Optional properties:
3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD
If this node is not mentioned or if the value is unknown, then
micbias is set to 2.0V.
- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
DVDD-supply : power supplies for the device as covered in
Documentation/devicetree/bindings/regulator/regulator.txt

CODEC output pins:
* HPL
Expand Down
5 changes: 4 additions & 1 deletion Documentation/input/elantech.txt
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,12 @@ byte 5:
* reg_10

bit 7 6 5 4 3 2 1 0
0 0 0 0 0 0 0 A
0 0 0 0 R F T A

A: 1 = enable absolute tracking
T: 1 = enable two finger mode auto correct
F: 1 = disable ABS Position Filter
R: 1 = enable real hardware resolution

6.2 Native absolute mode 6 byte packet format
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
8 changes: 4 additions & 4 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2218,10 +2218,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
noreplace-smp [X86-32,SMP] Don't replace SMP instructions
with UP alternatives

nordrand [X86] Disable the direct use of the RDRAND
instruction even if it is supported by the
processor. RDRAND is still available to user
space applications.
nordrand [X86] Disable kernel use of the RDRAND and
RDSEED instructions even if they are supported
by the processor. RDRAND and RDSEED are still
available to user space applications.

noresume [SWSUSP] Disables resume and restores original swap
space.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/scaling.txt
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ RPS and RFS were introduced in kernel 2.6.35. XPS was incorporated into
([email protected])

Accelerated RFS was introduced in 2.6.35. Original patches were
submitted by Ben Hutchings ([email protected])
submitted by Ben Hutchings ([email protected])

Authors:
Tom Herbert ([email protected])
Expand Down
51 changes: 33 additions & 18 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1893,14 +1893,15 @@ L: [email protected]
S: Supported
F: drivers/net/ethernet/broadcom/bnx2x/

BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
M: Christian Daudt <[email protected]>
M: Matt Porter <[email protected]>
L: [email protected]
T: git git://git.github.com/broadcom/bcm11351
T: git git://github.com/broadcom/mach-bcm
S: Maintained
F: arch/arm/mach-bcm/
F: arch/arm/boot/dts/bcm113*
F: arch/arm/boot/dts/bcm216*
F: arch/arm/boot/dts/bcm281*
F: arch/arm/configs/bcm_defconfig
F: drivers/mmc/host/sdhci_bcm_kona.c
Expand Down Expand Up @@ -2245,12 +2246,6 @@ L: [email protected]
S: Maintained
F: drivers/usb/host/ohci-ep93xx.c

CIRRUS LOGIC CS4270 SOUND DRIVER
M: Timur Tabi <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Odd Fixes
F: sound/soc/codecs/cs4270*

CIRRUS LOGIC AUDIO CODEC DRIVERS
M: Brian Austin <[email protected]>
M: Paul Handrigan <[email protected]>
Expand Down Expand Up @@ -3485,6 +3480,12 @@ S: Maintained
F: drivers/extcon/
F: Documentation/extcon/

EXYNOS DP DRIVER
M: Jingoo Han <[email protected]>
L: [email protected]
S: Maintained
F: drivers/gpu/drm/exynos/exynos_dp*

EXYNOS MIPI DISPLAY DRIVERS
M: Inki Dae <[email protected]>
M: Donghwa Lee <[email protected]>
Expand Down Expand Up @@ -3550,7 +3551,7 @@ F: include/scsi/libfcoe.h
F: include/uapi/scsi/fc/

FILE LOCKING (flock() and fcntl()/lockf())
M: Jeff Layton <jlayton@redhat.com>
M: Jeff Layton <jlayton@poochiereds.net>
M: J. Bruce Fields <[email protected]>
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -4812,6 +4813,14 @@ L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
F: kernel/irq/

IRQCHIP DRIVERS
M: Thomas Gleixner <[email protected]>
M: Jason Cooper <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
T: git git://git.infradead.org/users/jcooper/linux.git irqchip/core
F: drivers/irqchip/

IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
Expand Down Expand Up @@ -5108,14 +5117,19 @@ F: drivers/s390/kvm/

KERNEL VIRTUAL MACHINE (KVM) FOR ARM
M: Christoffer Dall <[email protected]>
M: Marc Zyngier <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected]
W: http://systems.cs.columbia.edu/projects/kvm-arm
S: Supported
F: arch/arm/include/uapi/asm/kvm*
F: arch/arm/include/asm/kvm*
F: arch/arm/kvm/
F: virt/kvm/arm/
F: include/kvm/arm_*

KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
M: Christoffer Dall <[email protected]>
M: Marc Zyngier <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected]
Expand Down Expand Up @@ -5479,15 +5493,15 @@ F: Documentation/hwmon/ltc4261
F: drivers/hwmon/ltc4261.c

LTP (Linux Test Project)
M: Shubham Goyal <[email protected]>
M: Mike Frysinger <[email protected]>
M: Cyril Hrubis <[email protected]>
M: Caspar Zhang <[email protected]>
M: Wanlong Gao <[email protected]>
M: Jan Stancek <[email protected]>
M: Stanislav Kholmanskikh <[email protected]>
M: Alexey Kodanev <[email protected]>
L: [email protected] (subscribers-only)
W: http://ltp.sourceforge.net/
W: http://linux-test-project.github.io/
T: git git://github.com/linux-test-project/ltp.git
T: git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
S: Maintained

M32R ARCHITECTURE
Expand Down Expand Up @@ -7277,7 +7291,6 @@ F: drivers/video/aty/aty128fb.c
RALINK RT2X00 WIRELESS LAN DRIVER
P: rt2x00 project
M: Ivo van Doorn <[email protected]>
M: Gertjan van Wingerde <[email protected]>
M: Helmut Schaa <[email protected]>
L: [email protected]
L: [email protected] (moderated for non-subscribers)
Expand All @@ -7293,7 +7306,7 @@ F: Documentation/blockdev/ramdisk.txt
F: drivers/block/brd.c

RANDOM NUMBER DRIVER
M: Theodore Ts'o" <[email protected]>
M: "Theodore Ts'o" <[email protected]>
S: Maintained
F: drivers/char/random.c

Expand Down Expand Up @@ -7674,7 +7687,6 @@ F: drivers/clk/samsung/
SAMSUNG SXGBE DRIVERS
M: Byungho An <[email protected]>
M: Girish K S <[email protected]>
M: Siva Reddy Kallam <[email protected]>
M: Vipul Pandya <[email protected]>
S: Supported
L: [email protected]
Expand Down Expand Up @@ -9098,6 +9110,9 @@ F: arch/um/os-Linux/drivers/

TURBOCHANNEL SUBSYSTEM
M: "Maciej W. Rozycki" <[email protected]>
M: Ralf Baechle <[email protected]>
L: [email protected]
Q: http://patchwork.linux-mips.org/project/linux-mips/list/
S: Maintained
F: drivers/tc/
F: include/linux/tc.h
Expand Down Expand Up @@ -9951,7 +9966,7 @@ F: drivers/net/hamradio/*scc.c
F: drivers/net/hamradio/z8530.h

ZBUD COMPRESSED PAGE ALLOCATOR
M: Seth Jennings <[email protected]>
M: Seth Jennings <[email protected]>
L: [email protected]
S: Maintained
F: mm/zbud.c
Expand Down Expand Up @@ -9996,7 +10011,7 @@ F: mm/zsmalloc.c
F: include/linux/zsmalloc.h

ZSWAP COMPRESSED SWAP CACHING
M: Seth Jennings <[email protected]>
M: Seth Jennings <[email protected]>
L: [email protected]
S: Maintained
F: mm/zswap.c
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 15
SUBLEVEL = 0
EXTRAVERSION = -rc3
EXTRAVERSION = -rc6
NAME = Shuffling Zombie Juror

# *DOCUMENTATION*
Expand Down
8 changes: 5 additions & 3 deletions arch/arc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -614,11 +614,13 @@ resume_user_mode_begin:

resume_kernel_mode:

#ifdef CONFIG_PREEMPT

; This is a must for preempt_schedule_irq()
; Disable Interrupts from this point on
; CONFIG_PREEMPT: This is a must for preempt_schedule_irq()
; !CONFIG_PREEMPT: To ensure restore_regs is intr safe
IRQ_DISABLE r9

#ifdef CONFIG_PREEMPT

; Can't preempt if preemption disabled
GET_CURR_THR_INFO_FROM_SP r10
ld r8, [r10, THREAD_INFO_PREEMPT_COUNT]
Expand Down
Loading

0 comments on commit cbfef53

Please sign in to comment.