Skip to contentSkip to conversation

Linux 3.0.24

DISCUSSION Greg KH 6 participants 19 messages Mar 12, 2012 – Mar 16, 2012

Subsystems (2)
lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 3.0.24 kernel.

All users of the 3.0 kernel series must upgrade.

The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

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

 Documentation/hwmon/jc42                    |   26 +-
 Makefile                                    |    2 
 arch/alpha/include/asm/futex.h              |    2 
 arch/arm/Kconfig                            |    2 
 arch/arm/mach-dove/common.c                 |    3 
 arch/arm/mach-kirkwood/common.c             |    3 
 arch/arm/mach-kirkwood/mpp.h                |  320 ++++++++++++++--------------
 arch/arm/mach-lpc32xx/include/mach/irqs.h   |    2 
 arch/arm/mach-lpc32xx/irq.c                 |   25 +-
 arch/arm/mach-lpc32xx/serial.c              |   20 +
 arch/arm/mach-mv78xx0/common.c              |    3 
 arch/arm/mach-mv78xx0/mpp.h                 |  226 +++++++++----------
 arch/arm/mach-omap2/board-4430sdp.c         |   31 +-
 arch/arm/mach-omap2/board-omap4panda.c      |   22 +
 arch/arm/mach-orion5x/common.c              |    4 
 arch/arm/mm/proc-v7.S                       |    4 
 arch/arm/plat-orion/common.c                |    9 
 arch/arm/plat-orion/include/plat/common.h   |    3 
 arch/arm/plat-orion/mpp.c                   |    3 
 arch/arm/plat-s3c24xx/dma.c                 |    2 
 arch/avr32/Kconfig                          |    1 
 arch/s390/Kconfig                           |    3 
 arch/s390/include/asm/compat.h              |    7 
 arch/s390/kernel/process.c                  |    1 
 arch/s390/kernel/ptrace.c                   |    2 
 arch/s390/kernel/setup.c                    |    2 
 arch/s390/mm/fault.c                        |    1 
 arch/s390/mm/mmap.c                         |    2 
 block/bsg.c                                 |    3 
 drivers/acpi/sleep.c                        |   16 +
 drivers/crypto/mv_cesa.c                    |    1 
 drivers/gpu/drm/i915/i915_reg.h             |   15 +
 drivers/gpu/drm/i915/intel_display.c        |   22 +
 drivers/gpu/drm/radeon/r600_blit_shaders.c  |    8 
 drivers/hid/hid-ids.h                       |    3 
 drivers/hid/usbhid/hid-quirks.c             |    1 
 drivers/hwmon/Kconfig                       |    5 
 drivers/hwmon/jc42.c                        |   30 ++
 drivers/hwmon/pmbus_core.c                  |    3 
 drivers/i2c/busses/i2c-mxs.c                |   13 -
 drivers/input/mouse/alps.c                  |    7 
 drivers/md/dm-io.c                          |   23 +-
 drivers/md/dm-raid.c                        |    1 
 drivers/mfd/cs5535-mfd.c                    |    6 
 drivers/mfd/mfd-core.c                      |    2 
 drivers/misc/cs5535-mfgpt.c                 |    2 
 drivers/mmc/host/sdhci-esdhc-imx.c          |    5 
 drivers/net/usb/cdc_ether.c                 |    7 
 drivers/net/usb/usbnet.c                    |    2 
 drivers/net/usb/zaurus.c                    |    7 
 drivers/net/wireless/ath/ath9k/ar5008_phy.c |   25 --
 drivers/net/wireless/ath/ath9k/ar9002_hw.c  |   19 +
 drivers/net/wireless/ath/ath9k/hw.h         |    1 
 drivers/net/wireless/ath/carl9170/tx.c      |    1 
 drivers/regulator/88pm8607.c                |    6 
 drivers/s390/block/dasd_eckd.c              |    2 
 drivers/s390/block/dasd_ioctl.c             |    1 
 drivers/s390/char/fs3270.c                  |    2 
 drivers/s390/char/vmcp.c                    |    1 
 drivers/s390/cio/chsc_sch.c                 |    1 
 drivers/s390/scsi/zfcp_cfdc.c               |    1 
 drivers/scsi/osd/osd_uld.c                  |    4 
 drivers/staging/lirc/lirc_serial.c          |  100 ++++----
 drivers/video/omap2/dss/hdmi.c              |   86 +++++++
 drivers/watchdog/hpwdt.c                    |    5 
 fs/autofs4/autofs_i.h                       |    1 
 fs/autofs4/dev-ioctl.c                      |    1 
 fs/autofs4/inode.c                          |    2 
 fs/autofs4/waitq.c                          |   22 +
 fs/binfmt_elf.c                             |    2 
 fs/cifs/dir.c                               |   20 +
 include/linux/compat.h                      |    4 
 include/linux/regset.h                      |   10 
 include/video/omapdss.h                     |    5 
 kernel/irq/manage.c                         |   44 +++
 kernel/kprobes.c                            |    4 
 mm/huge_memory.c                            |    6 
 mm/memcontrol.c                             |    5 
 mm/nommu.c                                  |    2 
 net/mac80211/rate.c                         |    2 
 sound/pci/hda/hda_codec.c                   |    8 
 sound/pci/hda/hda_codec.h                   |    3 
 sound/pci/hda/patch_conexant.c              |   22 +
 sound/pci/hda/patch_sigmatel.c              |    2 
 sound/soc/imx/imx-ssi.c                     |    2 
 sound/soc/soc-dapm.c                        |   12 -
 86 files changed, 855 insertions(+), 492 deletions(-)

Akio Idehara (1):
Input: ALPS - fix touchpad detection when buttons are pressed

Alan Stern (1):
HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboard

Alban Browaeys (1):

      drm/i915: Prevent a machine hang by checking crtc->active before loading lut

Andrea Arcangeli (1):

      mm: thp: fix BUG on mm->nr_ptes

Andrew Lunn (2):
ARM: orion: Fix USB phy for orion5x.
ARM: orion: Fix Orion5x GPIO regression from MPP cleanup

Andrew Morton (1):
alpha: fix 32/64-bit bug in futex support

Anton Vorontsov (1):
mm: memcg: Correct unregistring of events attached to the same eventfd

Ben Hutchings (4):
media: staging: lirc_serial: Fix init/exit order
media: staging: lirc_serial: Free resources on failure paths of lirc_serial_probe()
media: staging: lirc_serial: Fix deadlock on resume failure
media: staging: lirc_serial: Do not assume error codes returned by request_irq()

Boaz Harrosh (1):

      osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576

Christian Gmeiner (1):
mfd: Fix cs5535 section mismatch

Danny Kukawka (1):
cs5535-mfgpt: don't call __init function from __devinit

David Howells (2):
S390: KEYS: Enable the compat keyctl wrapper on s390x
NOMMU: Don't need to clear vm_mm when deleting a VMA

Eugeni Dodonov (3):
drm/i915: gen7: implement rczunit workaround drm/i915: gen7: Implement an L3 caching workaround. drm/i915: gen7: work around a system hang on IVB

Fabio Baltieri (1):
avr32: select generic atomic64_t support

Felix Fietkau (1):
ath9k_hw: prevent writes to const data on AR9160

Greg Kroah-Hartman (1):

      Linux 3.0.24

Guenter Roeck (2):
hwmon: (pmbus_core) Fix maximum number of POUT alarm attributes
hwmon: (jc42) Add support for AT30TS00, TS3000GB2, TSE2002GB2, and MCP9804

Gusakov Andrey (1):
ARM: S3C24XX: DMA resume regression fix

H. Peter Anvin (2):
regset: Prevent null pointer reference on readonly regsets
regset: Return -EFAULT, not -EIO, on host-side memory fault

Heiko Carstens (1):
compat: fix compile breakage on s390

Ian Kent (1):
autofs: work around unhappy compat problem on x86-64

Jan Beulich (1):
kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()"

Javier Martin (1):
ASoC: i.MX SSI: Fix DSP_A format.

Jean Delvare (2):
mfd: Fix ACPI conflict check
hwmon: (jc42) Add support for ST Microelectronics STTS2002 and STTS3000

Jeff Layton (1):
cifs: fix dentry refcount leak when opening a FIFO on lookup

Jett.Zhou (1):

      regulator: fix the ldo configure according to 88pm860x spec

Jonathan E Brassow (1):
dm raid: fix flush support

Keng-Yu Lin (1):
ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR

Kenneth Graunke (1):
drm/i915: gen7: Disable the RHWO optimization as it can cause GPU hangs.

Linus Torvalds (1):
Fix autofs compile without CONFIG_COMPAT

Marek Olšák (1):
drm/radeon/kms: set SX_MISC in the r6xx blit code (v2)

Mark Brown (1):
ASoC: dapm: Check for bias level when powering down

Maxim Uvarov (1):
watchdog: hpwdt: clean up set_memory_x call for 32 bit

Milan Broz (1):
dm io: fix discard support

Mohammed Shafi Shajakhan (1):
mac80211: zero initialize count field in ieee80211_tx_rate

Nicolas Cavallari (1):
carl9170: Fix memory accounting when sta is in power-save mode.

Phil Sutter (1):
crypto: mv_cesa - fix final callback not ignoring input data

Roland Stigge (5):
ARM: LPC32xx: serial.c: HW bug workaround
ARM: LPC32xx: serial.c: Fixed loop limit
ARM: LPC32xx: irq.c: Clear latched event
ARM: LPC32xx: Fix interrupt controller init
ARM: LPC32xx: Fix irq on GPI_28

Sascha Hauer (1):
mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5

Scott Talbert (1):
Move Logitech Harmony 900 from cdc_ether to zaurus

Sebastian Siewior (1):
net/usbnet: avoid recursive locking in usbnet_stop()

Stanislaw Gruszka (1):
bsg: fix sysfs link remove warning

Takashi Iwai (2):
ALSA: hda - Add a fake mute feature
ALSA: hda - Always set HP pin in unsol handler for STAC/IDT codecs

Thomas Gleixner (1):

      genirq: Clear action->thread_mask if IRQ_ONESHOT is not set

Tomi Valkeinen (7):
OMAP: DSS2: HDMI: use default dividers
OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios
OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD
OMAPDSS: remove wrong HDMI HPD muxing
OMAP: 4430SDP/Panda: setup HDMI GPIO muxes
OMAP: 4430SDP/Panda: add HDMI HPD gpio
OMAPDSS: HDMI: PHY burnout fix

Will Deacon (1):

      ARM: 7345/1: errata: update workaround for A9 erratum #743622

Wolfram Sang (1):
i2c: mxs: only flag completion when queue is completely done

author maintainer
#1 lore raw
Documentation/hwmon/jc42 +20 -6
index a22ecf4..52729a7 100644
@@ -7,21 +7,29 @@ Supported chips:
     Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
 	http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf
-  * IDT TSE2002B3, TS3000B3
-    Prefix: 'tse2002b3', 'ts3000b3'
+  * Atmel AT30TS00
+    Prefix: 'at30ts00'
     Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
-	http://www.idt.com/products/getdoc.cfm?docid=18715691
-	http://www.idt.com/products/getdoc.cfm?docid=18715692
+	http://www.atmel.com/Images/doc8585.pdf
+  * IDT TSE2002B3, TSE2002GB2, TS3000B3, TS3000GB2
+    Prefix: 'tse2002', 'ts3000'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+	http://www.idt.com/sites/default/files/documents/IDT_TSE2002B3C_DST_20100512_120303152056.pdf
+	http://www.idt.com/sites/default/files/documents/IDT_TSE2002GB2A1_DST_20111107_120303145914.pdf
+	http://www.idt.com/sites/default/files/documents/IDT_TS3000B3A_DST_20101129_120303152013.pdf
+	http://www.idt.com/sites/default/files/documents/IDT_TS3000GB2A1_DST_20111104_120303151012.pdf
   * Maxim MAX6604
     Prefix: 'max6604'
     Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
 	http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf
-  * Microchip MCP9805, MCP98242, MCP98243, MCP9843
-    Prefixes: 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'
+  * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP9843
+    Prefixes: 'mcp9804', 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'
     Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
+	http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf
 	http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf
 	http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf
 	http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf
@@ -48,6 +56,12 @@ Supported chips:
     Datasheets:
 	http://www.st.com/stonline/products/literature/ds/13447/stts424.pdf
 	http://www.st.com/stonline/products/literature/ds/13448/stts424e02.pdf
+  * ST Microelectronics STTS2002, STTS3000
+    Prefix: 'stts2002', 'stts3000'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00225278.pdf
+	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATA_BRIEF/CD00270920.pdf
   * JEDEC JC 42.4 compliant temperature sensor chips
     Prefix: 'jc42'
     Addresses scanned: I2C 0x18 - 0x1f
Makefile +1 -1
index d14684e..7526032 100644
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 23
+SUBLEVEL = 24
 EXTRAVERSION =
 NAME = Sneaky Weasel
 
arch/alpha/include/asm/futex.h +1 -1
index e8a761a..f939794 100644
@@ -108,7 +108,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 	"	lda	$31,3b-2b(%0)\n"
 	"	.previous\n"
 	:	"+r"(ret), "=&r"(prev), "=&r"(cmp)
-	:	"r"(uaddr), "r"((long)oldval), "r"(newval)
+	:	"r"(uaddr), "r"((long)(int)oldval), "r"(newval)
 	:	"memory");
 
 	*uval = prev;
arch/arm/Kconfig +1 -1
index 2456bad..f9b212e 100644
@@ -1179,7 +1179,7 @@ config ARM_ERRATA_743622
 	depends on CPU_V7
 	help
 	  This option enables the workaround for the 743622 Cortex-A9
-	  (r2p0..r2p2) erratum. Under very rare conditions, a faulty
+	  (r2p*) erratum. Under very rare conditions, a faulty
 	  optimisation in the Cortex-A9 Store Buffer may lead to data
 	  corruption. This workaround sets a specific bit in the diagnostic
 	  register of the Cortex-A9 which disables the Store Buffer
arch/arm/mach-dove/common.c +2 -1
index cf7e598..46c0449 100644
@@ -31,6 +31,7 @@
 #include <asm/mach/arch.h>
 #include <linux/irq.h>
 #include <plat/time.h>
+#include <plat/ehci-orion.h>
 #include <plat/common.h>
 #include "common.h"
 
@@ -74,7 +75,7 @@ void __init dove_map_io(void)
 void __init dove_ehci0_init(void)
 {
 	orion_ehci_init(&dove_mbus_dram_info,
-			DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);
+			DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0, EHCI_PHY_NA);
 }
 
 /*****************************************************************************
arch/arm/mach-kirkwood/common.c +2 -1
index f3248cf..c5dbbb3 100644
@@ -28,6 +28,7 @@
 #include <plat/cache-feroceon-l2.h>
 #include <plat/mvsdio.h>
 #include <plat/orion_nand.h>
+#include <plat/ehci-orion.h>
 #include <plat/common.h>
 #include <plat/time.h>
 #include "common.h"
@@ -74,7 +75,7 @@ void __init kirkwood_ehci_init(void)
 {
 	kirkwood_clk_ctrl |= CGC_USB0;
 	orion_ehci_init(&kirkwood_mbus_dram_info,
-			USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
+			USB_PHYS_BASE, IRQ_KIRKWOOD_USB, EHCI_PHY_NA);
 }
 
 
arch/arm/mach-kirkwood/mpp.h +160 -160

473 lines not on this page · raw message

arch/arm/mach-lpc32xx/include/mach/irqs.h +1 -1
index 2667f52..9e3b90d 100644
@@ -61,7 +61,7 @@
  */
 #define IRQ_LPC32XX_JTAG_COMM_TX	LPC32XX_SIC1_IRQ(1)
 #define IRQ_LPC32XX_JTAG_COMM_RX	LPC32XX_SIC1_IRQ(2)
-#define IRQ_LPC32XX_GPI_11		LPC32XX_SIC1_IRQ(4)
+#define IRQ_LPC32XX_GPI_28		LPC32XX_SIC1_IRQ(4)
 #define IRQ_LPC32XX_TS_P		LPC32XX_SIC1_IRQ(6)
 #define IRQ_LPC32XX_TS_IRQ		LPC32XX_SIC1_IRQ(7)
 #define IRQ_LPC32XX_TS_AUX		LPC32XX_SIC1_IRQ(8)
arch/arm/mach-lpc32xx/irq.c +20 -5
index 4eae566..c74de01 100644
@@ -118,6 +118,10 @@ static const struct lpc32xx_event_info lpc32xx_events[NR_IRQS] = {
 		.event_group = &lpc32xx_event_pin_regs,
 		.mask = LPC32XX_CLKPWR_EXTSRC_GPI_06_BIT,
 	},
+	[IRQ_LPC32XX_GPI_28] = {
+		.event_group = &lpc32xx_event_pin_regs,
+		.mask = LPC32XX_CLKPWR_EXTSRC_GPI_28_BIT,
+	},
 	[IRQ_LPC32XX_GPIO_00] = {
 		.event_group = &lpc32xx_event_int_regs,
 		.mask = LPC32XX_CLKPWR_INTSRC_GPIO_00_BIT,
@@ -305,9 +309,18 @@ static int lpc32xx_irq_wake(struct irq_data *d, unsigned int state)
 
 		if (state)
 			eventreg |= lpc32xx_events[d->irq].mask;
-		else
+		else {
 			eventreg &= ~lpc32xx_events[d->irq].mask;
 
+			/*
+			 * When disabling the wakeup, clear the latched
+			 * event
+			 */
+			__raw_writel(lpc32xx_events[d->irq].mask,
+				lpc32xx_events[d->irq].
+				event_group->rawstat_reg);
+		}
+
 		__raw_writel(eventreg,
 			lpc32xx_events[d->irq].event_group->enab_reg);
 
@@ -380,13 +393,15 @@ void __init lpc32xx_init_irq(void)
 
 	/* Setup SIC1 */
 	__raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC1_BASE));
-	__raw_writel(MIC_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC1_BASE));
-	__raw_writel(MIC_ATR_DEFAULT, LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC1_BASE));
+	__raw_writel(SIC1_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC1_BASE));
+	__raw_writel(SIC1_ATR_DEFAULT,
+				LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC1_BASE));
 
 	/* Setup SIC2 */
 	__raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC2_BASE));
-	__raw_writel(MIC_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC2_BASE));
-	__raw_writel(MIC_ATR_DEFAULT, LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC2_BASE));
+	__raw_writel(SIC2_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC2_BASE));
+	__raw_writel(SIC2_ATR_DEFAULT,
+				LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC2_BASE));
 
 	/* Configure supported IRQ's */
 	for (i = 0; i < NR_IRQS; i++) {
arch/arm/mach-lpc32xx/serial.c +19 -1
index 429cfdb..f273528 100644
@@ -88,6 +88,7 @@ struct uartinit {
 	char *uart_ck_name;
 	u32 ck_mode_mask;
 	void __iomem *pdiv_clk_reg;
+	resource_size_t mapbase;
 };
 
 static struct uartinit uartinit_data[] __initdata = {
@@ -97,6 +98,7 @@ static struct uartinit uartinit_data[] __initdata = {
 		.ck_mode_mask =
 			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 5),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART5_CLK_CTRL,
+		.mapbase = LPC32XX_UART5_BASE,
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART3_SELECT
@@ -105,6 +107,7 @@ static struct uartinit uartinit_data[] __initdata = {
 		.ck_mode_mask =
 			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 3),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART3_CLK_CTRL,
+		.mapbase = LPC32XX_UART3_BASE,
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART4_SELECT
@@ -113,6 +116,7 @@ static struct uartinit uartinit_data[] __initdata = {
 		.ck_mode_mask =
 			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 4),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART4_CLK_CTRL,
+		.mapbase = LPC32XX_UART4_BASE,
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART6_SELECT
@@ -121,6 +125,7 @@ static struct uartinit uartinit_data[] __initdata = {
 		.ck_mode_mask =
 			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 6),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART6_CLK_CTRL,
+		.mapbase = LPC32XX_UART6_BASE,
 	},
 #endif
 };
@@ -165,11 +170,24 @@ void __init lpc32xx_serial_init(void)
 
 		/* pre-UART clock divider set to 1 */
 		__raw_writel(0x0101, uartinit_data[i].pdiv_clk_reg);
+
+		/*
+		 * Force a flush of the RX FIFOs to work around a
+		 * HW bug
+		 */
+		puart = uartinit_data[i].mapbase;
+		__raw_writel(0xC1, LPC32XX_UART_IIR_FCR(puart));
+		__raw_writel(0x00, LPC32XX_UART_DLL_FIFO(puart));
+		j = LPC32XX_SUART_FIFO_SIZE;
+		while (j--)
+			tmp = __raw_readl(
+				LPC32XX_UART_DLL_FIFO(puart));
+		__raw_writel(0, LPC32XX_UART_IIR_FCR(puart));
 	}
 
 	/* This needs to be done after all UART clocks are setup */
 	__raw_writel(clkmodes, LPC32XX_UARTCTL_CLKMODE);
-	for (i = 0; i < ARRAY_SIZE(uartinit_data) - 1; i++) {
+	for (i = 0; i < ARRAY_SIZE(uartinit_data); i++) {
 		/* Force a flush of the RX FIFOs to work around a HW bug */
 		puart = serial_std_platform_data[i].mapbase;
 		__raw_writel(0xC1, LPC32XX_UART_IIR_FCR(puart));
arch/arm/mach-mv78xx0/common.c +2 -1
index 23d3980..d90e244 100644
@@ -20,6 +20,7 @@
 #include <mach/mv78xx0.h>
 #include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
+#include <plat/ehci-orion.h>
 #include <plat/orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
@@ -170,7 +171,7 @@ void __init mv78xx0_map_io(void)
 void __init mv78xx0_ehci0_init(void)
 {
 	orion_ehci_init(&mv78xx0_mbus_dram_info,
-			USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
+			USB0_PHYS_BASE, IRQ_MV78XX0_USB_0, EHCI_PHY_NA);
 }
 
 
arch/arm/mach-mv78xx0/mpp.h +113 -113

423 lines not on this page · raw message

arch/arm/mach-omap2/board-4430sdp.c +14 -17
index 63de2d3..14a5971 100644
@@ -49,8 +49,9 @@
 #define ETH_KS8851_QUART		138
 #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO	184
 #define OMAP4_SFH7741_ENABLE_GPIO		188
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
 static const int sdp4430_keymap[] = {
 	KEY(0, 0, KEY_E),
@@ -578,12 +579,8 @@ static void __init omap_sfh7741prox_init(void)
 
 static void sdp4430_hdmi_mux_init(void)
 {
-	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-	omap_mux_init_signal("hdmi_hpd",
-			OMAP_PIN_INPUT_PULLUP);
 	omap_mux_init_signal("hdmi_cec",
 			OMAP_PIN_INPUT_PULLUP);
-	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
 	omap_mux_init_signal("hdmi_ddc_scl",
 			OMAP_PIN_INPUT_PULLUP);
 	omap_mux_init_signal("hdmi_ddc_sda",
@@ -591,8 +588,9 @@ static void sdp4430_hdmi_mux_init(void)
 }
 
 static struct gpio sdp4430_hdmi_gpios[] = {
-	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_hpd"   },
+	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
 	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },
+	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -609,26 +607,21 @@ static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-	gpio_free(HDMI_GPIO_LS_OE);
-	gpio_free(HDMI_GPIO_HPD);
+	gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
 }
 
+static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
+	.hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device sdp4430_hdmi_device = {
 	.name = "hdmi",
 	.driver_name = "hdmi_panel",
 	.type = OMAP_DISPLAY_TYPE_HDMI,
-	.clocks	= {
-		.dispc	= {
-			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,
-		},
-		.hdmi	= {
-			.regn	= 15,
-			.regm2	= 1,
-		},
-	},
 	.platform_enable = sdp4430_panel_enable_hdmi,
 	.platform_disable = sdp4430_panel_disable_hdmi,
 	.channel = OMAP_DSS_CHANNEL_DIGIT,
+	.data = &sdp4430_hdmi_data,
 };
 
 static struct omap_dss_device *sdp4430_dss_devices[] = {
@@ -645,6 +638,10 @@ void omap_4430sdp_display_init(void)
 {
 	sdp4430_hdmi_mux_init();
 	omap_display_init(&sdp4430_dss_data);
+
+	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 #ifdef CONFIG_OMAP_MUX
arch/arm/mach-omap2/board-omap4panda.c +14 -8
index 0cfe200..107dfc3 100644
@@ -52,8 +52,9 @@
 #define GPIO_HUB_NRESET		62
 #define GPIO_WIFI_PMENA		43
 #define GPIO_WIFI_IRQ		53
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
 /* wl127x BT, FM, GPS connectivity chip */
 static int wl1271_gpios[] = {46, -1, -1};
@@ -614,12 +615,8 @@ int __init omap4_panda_dvi_init(void)
 
 static void omap4_panda_hdmi_mux_init(void)
 {
-	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-	omap_mux_init_signal("hdmi_hpd",
-			OMAP_PIN_INPUT_PULLUP);
 	omap_mux_init_signal("hdmi_cec",
 			OMAP_PIN_INPUT_PULLUP);
-	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
 	omap_mux_init_signal("hdmi_ddc_scl",
 			OMAP_PIN_INPUT_PULLUP);
 	omap_mux_init_signal("hdmi_ddc_sda",
@@ -627,8 +624,9 @@ static void omap4_panda_hdmi_mux_init(void)
 }
 
 static struct gpio panda_hdmi_gpios[] = {
-	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },
+	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
 	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
+	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -645,10 +643,13 @@ static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-	gpio_free(HDMI_GPIO_LS_OE);
-	gpio_free(HDMI_GPIO_HPD);
+	gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));
 }
 
+static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {
+	.hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device  omap4_panda_hdmi_device = {
 	.name = "hdmi",
 	.driver_name = "hdmi_panel",
@@ -656,6 +657,7 @@ static struct omap_dss_device  omap4_panda_hdmi_device = {
 	.platform_enable = omap4_panda_panel_enable_hdmi,
 	.platform_disable = omap4_panda_panel_disable_hdmi,
 	.channel = OMAP_DSS_CHANNEL_DIGIT,
+	.data = &omap4_panda_hdmi_data,
 };
 
 static struct omap_dss_device *omap4_panda_dss_devices[] = {
@@ -679,6 +681,10 @@ void omap4_panda_display_init(void)
 
 	omap4_panda_hdmi_mux_init();
 	omap_display_init(&omap4_panda_dss_data);
+
+	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 static void __init omap4_panda_init(void)
arch/arm/mach-orion5x/common.c +3 -1
index 0ab531d..8a98da0 100644
@@ -29,6 +29,7 @@
 #include <mach/hardware.h>
 #include <mach/orion5x.h>
 #include <plat/orion_nand.h>
+#include <plat/ehci-orion.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include "common.h"
@@ -72,7 +73,8 @@ void __init orion5x_map_io(void)
 void __init orion5x_ehci0_init(void)
 {
 	orion_ehci_init(&orion5x_mbus_dram_info,
-			ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
+			ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL,
+			EHCI_PHY_ORION);
 }
 
 
arch/arm/mm/proc-v7.S +1 -3
index b6ba103..7e47888 100644
@@ -344,9 +344,7 @@ __v7_setup:
 	mcreq	p15, 0, r10, c15, c0, 1		@ write diagnostic register
 #endif
 #ifdef CONFIG_ARM_ERRATA_743622
-	teq	r6, #0x20			@ present in r2p0
-	teqne	r6, #0x21			@ present in r2p1
-	teqne	r6, #0x22			@ present in r2p2
+	teq	r5, #0x00200000			@ only present in r2p*
 	mrceq	p15, 0, r10, c15, c0, 1		@ read diagnostic register
 	orreq	r10, r10, #1 << 6		@ set bit #6
 	mcreq	p15, 0, r10, c15, c0, 1		@ write diagnostic register
arch/arm/plat-orion/common.c +4 -5
index 9e5451b..11dce87 100644
@@ -806,10 +806,7 @@ void __init orion_xor1_init(unsigned long mapbase_low,
 /*****************************************************************************
  * EHCI
  ****************************************************************************/
-static struct orion_ehci_data orion_ehci_data = {
-	.phy_version	= EHCI_PHY_NA,
-};
-
+static struct orion_ehci_data orion_ehci_data;
 static u64 ehci_dmamask = DMA_BIT_MASK(32);
 
 
@@ -830,9 +827,11 @@ static struct platform_device orion_ehci = {
 
 void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
 			    unsigned long mapbase,
-			    unsigned long irq)
+			    unsigned long irq,
+			    enum orion_ehci_phy_ver phy_version)
 {
 	orion_ehci_data.dram = mbus_dram_info;
+	orion_ehci_data.phy_version = phy_version;
 	fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
 		       irq);
 
arch/arm/plat-orion/include/plat/common.h +2 -1
index a63c357..a2c0e31 100644
@@ -95,7 +95,8 @@ void __init orion_xor1_init(unsigned long mapbase_low,
 
 void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
 			    unsigned long mapbase,
-			    unsigned long irq);
+			    unsigned long irq,
+			    enum orion_ehci_phy_ver phy_version);
 
 void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
 			      unsigned long mapbase,
arch/arm/plat-orion/mpp.c +1 -2
index 9155343..3b1e17b 100644
@@ -64,8 +64,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
 			gpio_mode |= GPIO_INPUT_OK;
 		if (*mpp_list & MPP_OUTPUT_MASK)
 			gpio_mode |= GPIO_OUTPUT_OK;
-		if (sel != 0)
-			gpio_mode = 0;
+
 		orion_gpio_set_valid(num, gpio_mode);
 	}
 
arch/arm/plat-s3c24xx/dma.c +1 -1
index 539bd0e..0719f49 100644
@@ -1249,7 +1249,7 @@ static void s3c2410_dma_resume(void)
 	struct s3c2410_dma_chan *cp = s3c2410_chans + dma_channels - 1;
 	int channel;
 
-	for (channel = dma_channels - 1; channel >= 0; cp++, channel--)
+	for (channel = dma_channels - 1; channel >= 0; cp--, channel--)
 		s3c2410_dma_resume_chan(cp);
 }
 
arch/avr32/Kconfig +1 -0
index e9d689b..c614484 100644
@@ -8,6 +8,7 @@ config AVR32
 	select HAVE_KPROBES
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_PROBE
+	select GENERIC_ATOMIC64
 	select HARDIRQS_SW_RESEND
 	select GENERIC_IRQ_SHOW
 	help
arch/s390/Kconfig +3 -0
index c03fef7..9b922b1 100644
@@ -228,6 +228,9 @@ config COMPAT
 config SYSVIPC_COMPAT
 	def_bool y if COMPAT && SYSVIPC
 
+config KEYS_COMPAT
+	def_bool y if COMPAT && KEYS
+
 config AUDIT_ARCH
 	def_bool y
 
arch/s390/include/asm/compat.h +0 -7
index da359ca..f7b74bc 100644
@@ -172,13 +172,6 @@ static inline int is_compat_task(void)
 	return is_32bit_task();
 }
 
-#else
-
-static inline int is_compat_task(void)
-{
-	return 0;
-}
-
 #endif
 
 static inline void __user *arch_compat_alloc_user_space(long len)
arch/s390/kernel/process.c +0 -1
index 541a750..abdc2b1 100644
@@ -28,7 +28,6 @@
 #include <asm/irq.h>
 #include <asm/timer.h>
 #include <asm/nmi.h>
-#include <asm/compat.h>
 #include <asm/smp.h>
 #include "entry.h"
 
arch/s390/kernel/ptrace.c +1 -1
index 5804cfa..5c55466 100644
@@ -20,8 +20,8 @@
 #include <linux/regset.h>
 #include <linux/tracehook.h>
 #include <linux/seccomp.h>
+#include <linux/compat.h>
 #include <trace/syscall.h>
-#include <asm/compat.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
arch/s390/kernel/setup.c +1 -1
index 0c35dee..7547f57 100644
@@ -42,6 +42,7 @@
 #include <linux/reboot.h>
 #include <linux/topology.h>
 #include <linux/ftrace.h>
+#include <linux/compat.h>
 
 #include <asm/ipl.h>
 #include <asm/uaccess.h>
@@ -55,7 +56,6 @@
 #include <asm/ptrace.h>
 #include <asm/sections.h>
 #include <asm/ebcdic.h>
-#include <asm/compat.h>
 #include <asm/kvm_virtio.h>
 
 long psw_kernel_bits	= (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |
arch/s390/mm/fault.c +0 -1
index fe103e8..d814f79 100644
@@ -36,7 +36,6 @@
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/mmu_context.h>
-#include <asm/compat.h>
 #include "../kernel/entry.h"
 
 #ifndef CONFIG_64BIT
arch/s390/mm/mmap.c +1 -1
index c9a9f7f..c0cf9ce 100644
@@ -28,8 +28,8 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/random.h>
+#include <linux/compat.h>
 #include <asm/pgalloc.h>
-#include <asm/compat.h>
 
 static unsigned long stack_maxrandom_size(void)
 {
block/bsg.c +2 -1
index 0c8b64a..792ead6 100644
@@ -985,7 +985,8 @@ void bsg_unregister_queue(struct request_queue *q)
 
 	mutex_lock(&bsg_mutex);
 	idr_remove(&bsg_minor_idr, bcd->minor);
-	sysfs_remove_link(&q->kobj, "bsg");
+	if (q->kobj.sd)
+		sysfs_remove_link(&q->kobj, "bsg");
 	device_unregister(bcd->class_dev);
 	bcd->class_dev = NULL;
 	kref_put(&bcd->ref, bsg_kref_release_function);
drivers/acpi/sleep.c +16 -0
index 6c94960..0bd4832 100644
@@ -428,6 +428,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
 		},
 	},
+	{
+	.callback = init_nvs_nosave,
+	.ident = "Asus K54C",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
+		},
+	},
+	{
+	.callback = init_nvs_nosave,
+	.ident = "Asus K54HR",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
+		},
+	},
 	{},
 };
 #endif /* CONFIG_SUSPEND */
drivers/crypto/mv_cesa.c +1 -0
index 38a3297..f53dd83 100644
@@ -713,6 +713,7 @@ static int mv_hash_final(struct ahash_request *req)
 {
 	struct mv_req_hash_ctx *ctx = ahash_request_ctx(req);
 
+	ahash_request_set_crypt(req, NULL, req->result, 0);
 	mv_update_hash_req_ctx(ctx, 1, 0);
 	return mv_handle_req(&req->base);
 }
drivers/gpu/drm/i915/i915_reg.h +15 -0
index 673f0d2..56315cb 100644
@@ -2847,6 +2847,20 @@
 #define  DISP_TILE_SURFACE_SWIZZLING	(1<<13)
 #define  DISP_FBC_WM_DIS		(1<<15)
 
+/* GEN7 chicken */
+#define GEN7_COMMON_SLICE_CHICKEN1		0x7010
+# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC	((1<<10) | (1<<26))
+
+#define GEN7_L3CNTLREG1				0xB01C
+#define  GEN7_WA_FOR_GEN7_L3_CONTROL			0x3C4FFF8C
+
+#define GEN7_L3_CHICKEN_MODE_REGISTER		0xB030
+#define  GEN7_WA_L3_CHICKEN_MODE				0x20000000
+
+/* WaCatErrorRejectionIssue */
+#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG		0x9030
+#define  GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB	(1<<11)
+
 /* PCH */
 
 /* south display engine interrupt */
@@ -3371,6 +3385,7 @@
 #define  GT_FIFO_FREE_ENTRIES			0x120008
 
 #define GEN6_UCGCTL2				0x9404
+# define GEN6_RCZUNIT_CLOCK_GATE_DISABLE		(1 << 13)
 # define GEN6_RCPBUNIT_CLOCK_GATE_DISABLE		(1 << 12)
 # define GEN6_RCCUNIT_CLOCK_GATE_DISABLE		(1 << 11)
 
drivers/gpu/drm/i915/intel_display.c +21 -1
index fed87d6..57f9043 100644
@@ -5265,7 +5265,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
 	int i;
 
 	/* The clocks have to be on to load the palette. */
-	if (!crtc->enabled)
+	if (!crtc->enabled || !intel_crtc->active)
 		return;
 
 	/* use legacy palette for Ironlake */
@@ -7457,8 +7457,28 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
 	I915_WRITE(WM2_LP_ILK, 0);
 	I915_WRITE(WM1_LP_ILK, 0);
 
+	/* According to the spec, bit 13 (RCZUNIT) must be set on IVB.
+	 * This implements the WaDisableRCZUnitClockGating workaround.
+	 */
+	I915_WRITE(GEN6_UCGCTL2, GEN6_RCZUNIT_CLOCK_GATE_DISABLE);
+
 	I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE);
 
+	/* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */
+	I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1,
+		   GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC);
+
+	/* WaApplyL3ControlAndL3ChickenMode requires those two on Ivy Bridge */
+	I915_WRITE(GEN7_L3CNTLREG1,
+			GEN7_WA_FOR_GEN7_L3_CONTROL);
+	I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER,
+			GEN7_WA_L3_CHICKEN_MODE);
+
+	/* This is required by WaCatErrorRejectionIssue */
+	I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG,
+			I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) |
+			GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB);
+
 	for_each_pipe(pipe)
 		I915_WRITE(DSPCNTR(pipe),
 			   I915_READ(DSPCNTR(pipe)) |
drivers/gpu/drm/radeon/r600_blit_shaders.c +8 -0
index 2d1f6c5..73e2c7c 100644
@@ -314,6 +314,10 @@ const u32 r6xx_default_state[] =
 	0x00000000, /* VGT_VTX_CNT_EN */
 
 	0xc0016900,
+	0x000000d4,
+	0x00000000, /* SX_MISC */
+
+	0xc0016900,
 	0x000002c8,
 	0x00000000, /* VGT_STRMOUT_BUFFER_EN */
 
@@ -626,6 +630,10 @@ const u32 r7xx_default_state[] =
 	0x00000000, /* VGT_VTX_CNT_EN */
 
 	0xc0016900,
+	0x000000d4,
+	0x00000000, /* SX_MISC */
+
+	0xc0016900,
 	0x000002c8,
 	0x00000000, /* VGT_STRMOUT_BUFFER_EN */
 
drivers/hid/hid-ids.h +3 -0
index e0a28ad..6781fe0 100644
@@ -59,6 +59,9 @@
 #define USB_VENDOR_ID_AIRCABLE		0x16CA
 #define USB_DEVICE_ID_AIRCABLE1		0x1502
 
+#define USB_VENDOR_ID_AIREN		0x1a2c
+#define USB_DEVICE_ID_AIREN_SLIMPLUS	0x0002
+
 #define USB_VENDOR_ID_ALCOR		0x058f
 #define USB_DEVICE_ID_ALCOR_USBRS232	0x9720
 
drivers/hid/usbhid/hid-quirks.c +1 -0
index 3146fdc..85c845f 100644
@@ -52,6 +52,7 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
 
+	{ USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
drivers/hwmon/Kconfig +3 -2
index 5f888f7..6030f20 100644
@@ -474,8 +474,9 @@ config SENSORS_JC42
 	  If you say yes here, you get support for JEDEC JC42.4 compliant
 	  temperature sensors, which are used on many DDR3 memory modules for
 	  mobile devices and servers.  Support will include, but not be limited
-	  to, ADT7408, CAT34TS02, CAT6095, MAX6604, MCP9805, MCP98242, MCP98243,
-	  MCP9843, SE97, SE98, STTS424(E), TSE2002B3, and TS3000B3.
+	  to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805,
+	  MCP98242, MCP98243, MCP9843, SE97, SE98, STTS424(E), STTS2002,
+	  STTS3000, TSE2002B3, TSE2002GB2, TS3000B3, and TS3000GB2.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called jc42.
drivers/hwmon/jc42.c +28 -2
index 02cebb7..ed43924 100644
@@ -64,6 +64,7 @@ static const unsigned short normal_i2c[] = {
 
 /* Manufacturer IDs */
 #define ADT_MANID		0x11d4  /* Analog Devices */
+#define ATMEL_MANID		0x001f  /* Atmel */
 #define MAX_MANID		0x004d  /* Maxim */
 #define IDT_MANID		0x00b3  /* IDT */
 #define MCP_MANID		0x0054  /* Microchip */
@@ -77,15 +78,25 @@ static const unsigned short normal_i2c[] = {
 #define ADT7408_DEVID		0x0801
 #define ADT7408_DEVID_MASK	0xffff
 
+/* Atmel */
+#define AT30TS00_DEVID		0x8201
+#define AT30TS00_DEVID_MASK	0xffff
+
 /* IDT */
 #define TS3000B3_DEVID		0x2903  /* Also matches TSE2002B3 */
 #define TS3000B3_DEVID_MASK	0xffff
 
+#define TS3000GB2_DEVID		0x2912  /* Also matches TSE2002GB2 */
+#define TS3000GB2_DEVID_MASK	0xffff
+
 /* Maxim */
 #define MAX6604_DEVID		0x3e00
 #define MAX6604_DEVID_MASK	0xffff
 
 /* Microchip */
+#define MCP9804_DEVID		0x0200
+#define MCP9804_DEVID_MASK	0xfffc
+
 #define MCP98242_DEVID		0x2000
 #define MCP98242_DEVID_MASK	0xfffc
 
@@ -113,6 +124,12 @@ static const unsigned short normal_i2c[] = {
 #define STTS424E_DEVID		0x0000
 #define STTS424E_DEVID_MASK	0xfffe
 
+#define STTS2002_DEVID		0x0300
+#define STTS2002_DEVID_MASK	0xffff
+
+#define STTS3000_DEVID		0x0200
+#define STTS3000_DEVID_MASK	0xffff
+
 static u16 jc42_hysteresis[] = { 0, 1500, 3000, 6000 };
 
 struct jc42_chips {
@@ -123,8 +140,11 @@ struct jc42_chips {
 
 static struct jc42_chips jc42_chips[] = {
 	{ ADT_MANID, ADT7408_DEVID, ADT7408_DEVID_MASK },
+	{ ATMEL_MANID, AT30TS00_DEVID, AT30TS00_DEVID_MASK },
 	{ IDT_MANID, TS3000B3_DEVID, TS3000B3_DEVID_MASK },
+	{ IDT_MANID, TS3000GB2_DEVID, TS3000GB2_DEVID_MASK },
 	{ MAX_MANID, MAX6604_DEVID, MAX6604_DEVID_MASK },
+	{ MCP_MANID, MCP9804_DEVID, MCP9804_DEVID_MASK },
 	{ MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK },
 	{ MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK },
 	{ MCP_MANID, MCP9843_DEVID, MCP9843_DEVID_MASK },
@@ -133,6 +153,8 @@ static struct jc42_chips jc42_chips[] = {
 	{ NXP_MANID, SE98_DEVID, SE98_DEVID_MASK },
 	{ STM_MANID, STTS424_DEVID, STTS424_DEVID_MASK },
 	{ STM_MANID, STTS424E_DEVID, STTS424E_DEVID_MASK },
+	{ STM_MANID, STTS2002_DEVID, STTS2002_DEVID_MASK },
+	{ STM_MANID, STTS3000_DEVID, STTS3000_DEVID_MASK },
 };
 
 /* Each client has this additional data */
@@ -161,10 +183,12 @@ static struct jc42_data *jc42_update_device(struct device *dev);
 
 static const struct i2c_device_id jc42_id[] = {
 	{ "adt7408", 0 },
+	{ "at30ts00", 0 },
 	{ "cat94ts02", 0 },
 	{ "cat6095", 0 },
 	{ "jc42", 0 },
 	{ "max6604", 0 },
+	{ "mcp9804", 0 },
 	{ "mcp9805", 0 },
 	{ "mcp98242", 0 },
 	{ "mcp98243", 0 },
@@ -173,8 +197,10 @@ static const struct i2c_device_id jc42_id[] = {
 	{ "se97b", 0 },
 	{ "se98", 0 },
 	{ "stts424", 0 },
-	{ "tse2002b3", 0 },
-	{ "ts3000b3", 0 },
+	{ "stts2002", 0 },
+	{ "stts3000", 0 },
+	{ "tse2002", 0 },
+	{ "ts3000", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, jc42_id);
drivers/hwmon/pmbus_core.c +2 -1
index 8e31a8e..ffa54dd 100644
@@ -50,7 +50,8 @@
 						   lcrit_alarm, crit_alarm */
 #define PMBUS_IOUT_BOOLEANS_PER_PAGE	3	/* alarm, lcrit_alarm,
 						   crit_alarm */
-#define PMBUS_POUT_BOOLEANS_PER_PAGE	2	/* alarm, crit_alarm */
+#define PMBUS_POUT_BOOLEANS_PER_PAGE	3	/* cap_alarm, alarm, crit_alarm
+						 */
 #define PMBUS_MAX_BOOLEANS_PER_FAN	2	/* alarm, fault */
 #define PMBUS_MAX_BOOLEANS_PER_TEMP	4	/* min_alarm, max_alarm,
 						   lcrit_alarm, crit_alarm */
drivers/i2c/busses/i2c-mxs.c +10 -3
index 7e78f7c..3d471d5 100644
@@ -72,6 +72,7 @@
 
 #define MXS_I2C_QUEUESTAT	(0x70)
 #define MXS_I2C_QUEUESTAT_RD_QUEUE_EMPTY        0x00002000
+#define MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK	0x0000001F
 
 #define MXS_I2C_QUEUECMD	(0x80)
 
@@ -219,14 +220,14 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
 	int ret;
 	int flags;
 
-	init_completion(&i2c->cmd_complete);
-
 	dev_dbg(i2c->dev, "addr: 0x%04x, len: %d, flags: 0x%x, stop: %d\n",
 		msg->addr, msg->len, msg->flags, stop);
 
 	if (msg->len == 0)
 		return -EINVAL;
 
+	init_completion(&i2c->cmd_complete);
+
 	flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0;
 
 	if (msg->flags & I2C_M_RD)
@@ -286,6 +287,7 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id)
 {
 	struct mxs_i2c_dev *i2c = dev_id;
 	u32 stat = readl(i2c->regs + MXS_I2C_CTRL1) & MXS_I2C_IRQ_MASK;
+	bool is_last_cmd;
 
 	if (!stat)
 		return IRQ_NONE;
@@ -300,9 +302,14 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id)
 	else
 		i2c->cmd_err = 0;
 
-	complete(&i2c->cmd_complete);
+	is_last_cmd = (readl(i2c->regs + MXS_I2C_QUEUESTAT) &
+		MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK) == 0;
+
+	if (is_last_cmd || i2c->cmd_err)
+		complete(&i2c->cmd_complete);
 
 	writel(stat, i2c->regs + MXS_I2C_CTRL1_CLR);
+
 	return IRQ_HANDLED;
 }
 
drivers/input/mouse/alps.c +5 -2
index 99d5876..0b99443 100644
@@ -426,7 +426,9 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
 
 	/*
 	 * First try "E6 report".
-	 * ALPS should return 0,0,10 or 0,0,100
+	 * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.
+	 * The bits 0-2 of the first byte will be 1s if some buttons are
+	 * pressed.
 	 */
 	param[0] = 0;
 	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||
@@ -441,7 +443,8 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
 
 	dbg("E6 report: %2.2x %2.2x %2.2x", param[0], param[1], param[2]);
 
-	if (param[0] != 0 || param[1] != 0 || (param[2] != 10 && param[2] != 100))
+	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||
+	    (param[2] != 10 && param[2] != 100))
 		return NULL;
 
 	/*
drivers/md/dm-io.c +16 -7
index ad2eba4..ea5dd28 100644
@@ -296,6 +296,8 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
 	unsigned offset;
 	unsigned num_bvecs;
 	sector_t remaining = where->count;
+	struct request_queue *q = bdev_get_queue(where->bdev);
+	sector_t discard_sectors;
 
 	/*
 	 * where->count may be zero if rw holds a flush and we need to
@@ -305,9 +307,12 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
 		/*
 		 * Allocate a suitably sized-bio.
 		 */
-		num_bvecs = dm_sector_div_up(remaining,
-					     (PAGE_SIZE >> SECTOR_SHIFT));
-		num_bvecs = min_t(int, bio_get_nr_vecs(where->bdev), num_bvecs);
+		if (rw & REQ_DISCARD)
+			num_bvecs = 1;
+		else
+			num_bvecs = min_t(int, bio_get_nr_vecs(where->bdev),
+					  dm_sector_div_up(remaining, (PAGE_SIZE >> SECTOR_SHIFT)));
+
 		bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);
 		bio->bi_sector = where->sector + (where->count - remaining);
 		bio->bi_bdev = where->bdev;
@@ -315,10 +320,14 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
 		bio->bi_destructor = dm_bio_destructor;
 		store_io_and_region_in_bio(bio, io, region);
 
-		/*
-		 * Try and add as many pages as possible.
-		 */
-		while (remaining) {
+		if (rw & REQ_DISCARD) {
+			discard_sectors = min_t(sector_t, q->limits.max_discard_sectors, remaining);
+			bio->bi_size = discard_sectors << SECTOR_SHIFT;
+			remaining -= discard_sectors;
+		} else while (remaining) {
+			/*
+			 * Try and add as many pages as possible.
+			 */
 			dp->get_page(dp, &page, &len, &offset);
 			len = min(len, to_bytes(remaining));
 			if (!bio_add_page(bio, page, len, offset))
drivers/md/dm-raid.c +1 -0
index e5d8904..437ae18 100644
@@ -468,6 +468,7 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv)
 	INIT_WORK(&rs->md.event_work, do_table_event);
 	ti->split_io = rs->md.chunk_sectors;
 	ti->private = rs;
+	ti->num_flush_requests = 1;
 
 	mutex_lock(&rs->md.reconfig_mutex);
 	ret = md_run(&rs->md);
drivers/mfd/cs5535-mfd.c +3 -3
index 155fa04..e488a78 100644
@@ -179,7 +179,7 @@ static struct pci_device_id cs5535_mfd_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cs5535_mfd_pci_tbl);
 
-static struct pci_driver cs5535_mfd_drv = {
+static struct pci_driver cs5535_mfd_driver = {
 	.name = DRV_NAME,
 	.id_table = cs5535_mfd_pci_tbl,
 	.probe = cs5535_mfd_probe,
@@ -188,12 +188,12 @@ static struct pci_driver cs5535_mfd_drv = {
 
 static int __init cs5535_mfd_init(void)
 {
-	return pci_register_driver(&cs5535_mfd_drv);
+	return pci_register_driver(&cs5535_mfd_driver);
 }
 
 static void __exit cs5535_mfd_exit(void)
 {
-	pci_unregister_driver(&cs5535_mfd_drv);
+	pci_unregister_driver(&cs5535_mfd_driver);
 }
 
 module_init(cs5535_mfd_init);
drivers/mfd/mfd-core.c +1 -1
index 0902523..acf9dad 100644
@@ -122,7 +122,7 @@ static int mfd_add_device(struct device *parent, int id,
 		}
 
 		if (!cell->ignore_resource_conflicts) {
-			ret = acpi_check_resource_conflict(res);
+			ret = acpi_check_resource_conflict(&res[r]);
 			if (ret)
 				goto fail_res;
 		}
drivers/misc/cs5535-mfgpt.c +1 -1
index bc685bf..87a390d 100644
@@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
  * In other cases (such as with VSAless OpenFirmware), the system firmware
  * leaves timers available for us to use.
  */
-static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
+static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
 {
 	struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
 	unsigned long flags;
drivers/mmc/host/sdhci-esdhc-imx.c +3 -2
index ba31abe..92e5437 100644
@@ -139,8 +139,9 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
 		imx_data->scratchpad = val;
 		return;
 	case SDHCI_COMMAND:
-		if ((host->cmd->opcode == MMC_STOP_TRANSMISSION)
-			&& (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
+		if ((host->cmd->opcode == MMC_STOP_TRANSMISSION ||
+		     host->cmd->opcode == MMC_SET_BLOCK_COUNT) &&
+	            (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
 			val |= SDHCI_CMD_ABORTCMD;
 		writel(val << 16 | imx_data->scratchpad,
 			host->ioaddr + SDHCI_TRANSFER_MODE);
drivers/net/usb/cdc_ether.c +7 -0
index c924ea2..13919dd 100644
@@ -570,6 +570,13 @@ static const struct usb_device_id	products [] = {
 	.driver_info = (unsigned long)&wwan_info,
 },
 
+/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+	.driver_info		= 0,
+},
+
 /*
  * WHITELIST!!!
  *
drivers/net/usb/usbnet.c +2 -0
index ce395fe..4918cf5 100644
@@ -585,6 +585,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 		entry = (struct skb_data *) skb->cb;
 		urb = entry->urb;
 
+		spin_unlock_irqrestore(&q->lock, flags);
 		// during some PM-driven resume scenarios,
 		// these (async) unlinks complete immediately
 		retval = usb_unlink_urb (urb);
@@ -592,6 +593,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 			netdev_dbg(dev->net, "unlink urb err, %d\n", retval);
 		else
 			count++;
+		spin_lock_irqsave(&q->lock, flags);
 	}
 	spin_unlock_irqrestore (&q->lock, flags);
 	return count;
drivers/net/usb/zaurus.c +7 -0
index 1a2234c..246b3bb 100644
@@ -349,6 +349,13 @@ static const struct usb_device_id	products [] = {
 	ZAURUS_MASTER_INTERFACE,
 	.driver_info = OLYMPUS_MXL_INFO,
 },
+
+/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+	.driver_info = (unsigned long) &bogus_mdlm_info,
+},
 	{ },		// END
 };
 MODULE_DEVICE_TABLE(usb, products);
drivers/net/wireless/ath/ath9k/ar5008_phy.c +1 -24
index 441bb33..0f23b1a 100644
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
 	ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
 	ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
 	ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
-	ATH_ALLOC_BANK(ah->addac5416_21,
-		       ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);
 	ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
 
 	return 0;
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
 	ATH_FREE_BANK(ah->analogBank6Data);
 	ATH_FREE_BANK(ah->analogBank6TPCData);
 	ATH_FREE_BANK(ah->analogBank7Data);
-	ATH_FREE_BANK(ah->addac5416_21);
 	ATH_FREE_BANK(ah->bank6Temp);
 
 #undef ATH_FREE_BANK
@@ -799,27 +796,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
 	REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_EXTERNAL_RADIO);
 	ah->eep_ops->set_addac(ah, chan);
 
-	if (AR_SREV_5416_22_OR_LATER(ah)) {
-		REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
-	} else {
-		struct ar5416IniArray temp;
-		u32 addacSize =
-			sizeof(u32) * ah->iniAddac.ia_rows *
-			ah->iniAddac.ia_columns;
-
-		/* For AR5416 2.0/2.1 */
-		memcpy(ah->addac5416_21,
-		       ah->iniAddac.ia_array, addacSize);
-
-		/* override CLKDRV value at [row, column] = [31, 1] */
-		(ah->addac5416_21)[31 * ah->iniAddac.ia_columns + 1] = 0;
-
-		temp.ia_array = ah->addac5416_21;
-		temp.ia_columns = ah->iniAddac.ia_columns;
-		temp.ia_rows = ah->iniAddac.ia_rows;
-		REG_WRITE_ARRAY(&temp, 1, regWrites);
-	}
-
+	REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
 	REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_INTERNAL_ADDAC);
 
 	ENABLE_REGWRITE_BUFFER(ah);
drivers/net/wireless/ath/ath9k/ar9002_hw.c +19 -0
index c32f9d1..30bf703 100644
@@ -179,6 +179,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
 		INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
 			       ARRAY_SIZE(ar5416Addac), 2);
 	}
+
+	/* iniAddac needs to be modified for these chips */
+	if (AR_SREV_9160(ah) || !AR_SREV_5416_22_OR_LATER(ah)) {
+		struct ar5416IniArray *addac = &ah->iniAddac;
+		u32 size = sizeof(u32) * addac->ia_rows * addac->ia_columns;
+		u32 *data;
+
+		data = kmalloc(size, GFP_KERNEL);
+		if (!data)
+			return;
+
+		memcpy(data, addac->ia_array, size);
+		addac->ia_array = data;
+
+		if (!AR_SREV_5416_22_OR_LATER(ah)) {
+			/* override CLKDRV value */
+			INI_RA(addac, 31,1) = 0;
+		}
+	}
 }
 
 /* Support for Japan ch.14 (2484) spread */
drivers/net/wireless/ath/ath9k/hw.h +0 -1
index 939cc9d..9dc2666 100644
@@ -763,7 +763,6 @@ struct ath_hw {
 	u32 *analogBank6Data;
 	u32 *analogBank6TPCData;
 	u32 *analogBank7Data;
-	u32 *addac5416_21;
 	u32 *bank6Temp;
 
 	u8 txpower_limit;
drivers/net/wireless/ath/carl9170/tx.c +1 -0
index e94084f..f190f32 100644
@@ -1245,6 +1245,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
 			atomic_dec(&ar->tx_ampdu_upload);
 
 		tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
+		carl9170_release_dev_space(ar, skb);
 		carl9170_tx_status(ar, skb, false);
 		return true;
 	}
drivers/regulator/88pm8607.c +3 -3
index d63fddb..acda58e 100644
@@ -195,7 +195,7 @@ static const unsigned int LDO12_suspend_table[] = {
 };
 
 static const unsigned int LDO13_table[] = {
-	1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0, 0,
+	1200000, 1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0,
 };
 
 static const unsigned int LDO13_suspend_table[] = {
@@ -388,10 +388,10 @@ static struct pm8607_regulator_info pm8607_regulator_info[] = {
 	PM8607_LDO( 7,         LDO7, 0, 3, SUPPLIES_EN12, 1),
 	PM8607_LDO( 8,         LDO8, 0, 3, SUPPLIES_EN12, 2),
 	PM8607_LDO( 9,         LDO9, 0, 3, SUPPLIES_EN12, 3),
-	PM8607_LDO(10,        LDO10, 0, 3, SUPPLIES_EN12, 4),
+	PM8607_LDO(10,        LDO10, 0, 4, SUPPLIES_EN12, 4),
 	PM8607_LDO(12,        LDO12, 0, 4, SUPPLIES_EN12, 5),
 	PM8607_LDO(13, VIBRATOR_SET, 1, 3,  VIBRATOR_SET, 0),
-	PM8607_LDO(14,        LDO14, 0, 4, SUPPLIES_EN12, 6),
+	PM8607_LDO(14,        LDO14, 0, 3, SUPPLIES_EN12, 6),
 };
 
 static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
drivers/s390/block/dasd_eckd.c +1 -1
index 30fb979..cc2dd7f 100644
@@ -18,12 +18,12 @@
 #include <linux/hdreg.h>	/* HDIO_GETGEO			    */
 #include <linux/bio.h>
 #include <linux/module.h>
+#include <linux/compat.h>
 #include <linux/init.h>
 
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/ebcdic.h>
-#include <asm/compat.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/cio.h>
drivers/s390/block/dasd_ioctl.c +1 -0
index 72261e4..9caeaea5 100644
@@ -13,6 +13,7 @@
 #define KMSG_COMPONENT "dasd"
 
 #include <linux/interrupt.h>
+#include <linux/compat.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/blkpg.h>
drivers/s390/char/fs3270.c +1 -1
index f6489eb..e197fd7 100644
@@ -14,8 +14,8 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/compat.h>
 
-#include <asm/compat.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
drivers/s390/char/vmcp.c +1 -0
index 31a3ccb..84e569c 100644
@@ -13,6 +13,7 @@
 
 #include <linux/fs.h>
 #include <linux/init.h>
+#include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
drivers/s390/cio/chsc_sch.c +1 -0
index e950f1a..ec76029 100644
@@ -8,6 +8,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/compat.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
drivers/s390/scsi/zfcp_cfdc.c +1 -0
index 303dde0..fab2c25 100644
@@ -11,6 +11,7 @@
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/compat.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
drivers/scsi/osd/osd_uld.c +2 -2
index b31a8e3..d4ed9eb 100644
@@ -69,10 +69,10 @@
 #ifndef SCSI_OSD_MAJOR
 #  define SCSI_OSD_MAJOR 260
 #endif
-#define SCSI_OSD_MAX_MINOR 64
+#define SCSI_OSD_MAX_MINOR MINORMASK
 
 static const char osd_name[] = "osd";
-static const char *osd_version_string = "open-osd 0.2.0";
+static const char *osd_version_string = "open-osd 0.2.1";
 
 MODULE_AUTHOR("Boaz Harrosh <[email protected]>");
 MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");
drivers/staging/lirc/lirc_serial.c +47 -53

170 lines not on this page · raw message

drivers/video/omap2/dss/hdmi.c +80 -6

153 lines not on this page · raw message

drivers/watchdog/hpwdt.c +3 -2
index 9cb60df..d4ab797 100644
@@ -216,7 +216,7 @@ static int __devinit cru_detect(unsigned long map_entry,
 
 	cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
 
-	set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));
+	set_memory_x((unsigned long)bios32_map, 2);
 	asminline_call(&cmn_regs, bios32_entrypoint);
 
 	if (cmn_regs.u1.ral != 0) {
@@ -235,7 +235,8 @@ static int __devinit cru_detect(unsigned long map_entry,
 			cru_rom_addr =
 				ioremap(cru_physical_address, cru_length);
 			if (cru_rom_addr) {
-				set_memory_x((unsigned long)cru_rom_addr, cru_length);
+				set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+					(cru_length + PAGE_SIZE - 1) >> PAGE_SHIFT);
 				retval = 0;
 			}
 		}
fs/autofs4/autofs_i.h +1 -0
index 475f9c5..10cc45a 100644
@@ -120,6 +120,7 @@ struct autofs_sb_info {
 	int sub_version;
 	int min_proto;
 	int max_proto;
+	int compat_daemon;
 	unsigned long exp_timeout;
 	unsigned int type;
 	int reghost_enabled;
fs/autofs4/dev-ioctl.c +1 -0
index 509fe1e..56bac70 100644
@@ -385,6 +385,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
 		sbi->pipefd = pipefd;
 		sbi->pipe = pipe;
 		sbi->catatonic = 0;
+		sbi->compat_daemon = is_compat_task();
 	}
 out:
 	mutex_unlock(&sbi->wq_mutex);
fs/autofs4/inode.c +2 -0
index 180fa24..eb1e45c 100644
@@ -19,6 +19,7 @@
 #include <linux/parser.h>
 #include <linux/bitops.h>
 #include <linux/magic.h>
+#include <linux/compat.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 
@@ -224,6 +225,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 	set_autofs_type_indirect(&sbi->type);
 	sbi->min_proto = 0;
 	sbi->max_proto = 0;
+	sbi->compat_daemon = is_compat_task();
 	mutex_init(&sbi->wq_mutex);
 	spin_lock_init(&sbi->fs_lock);
 	sbi->queues = NULL;
fs/autofs4/waitq.c +19 -3
index 2543598..fbbb749 100644
@@ -90,7 +90,24 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
 
 	return (bytes > 0);
 }
-	
+
+/*
+ * The autofs_v5 packet was misdesigned.
+ *
+ * The packets are identical on x86-32 and x86-64, but have different
+ * alignment. Which means that 'sizeof()' will give different results.
+ * Fix it up for the case of running 32-bit user mode on a 64-bit kernel.
+ */
+static noinline size_t autofs_v5_packet_size(struct autofs_sb_info *sbi)
+{
+	size_t pktsz = sizeof(struct autofs_v5_packet);
+#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
+	if (sbi->compat_daemon > 0)
+		pktsz -= 4;
+#endif
+	return pktsz;
+}
+
 static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
 				 struct autofs_wait_queue *wq,
 				 int type)
@@ -147,8 +164,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
 	{
 		struct autofs_v5_packet *packet = &pkt.v5_pkt.v5_packet;
 
-		pktsz = sizeof(*packet);
-
+		pktsz = autofs_v5_packet_size(sbi);
 		packet->wait_queue_token = wq->wait_queue_token;
 		packet->len = wq->name.len;
 		memcpy(packet->name, wq->name.name, wq->name.len);
fs/binfmt_elf.c +1 -1
index 9ba2ac7..618493e 100644
@@ -1422,7 +1422,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
 	for (i = 1; i < view->n; ++i) {
 		const struct user_regset *regset = &view->regsets[i];
 		do_thread_regset_writeback(t->task, regset);
-		if (regset->core_note_type &&
+		if (regset->core_note_type && regset->get &&
 		    (!regset->active || regset->active(t->task, regset))) {
 			int ret;
 			size_t size = regset->n * regset->size;
fs/cifs/dir.c +18 -2
index 16cdd6d..ed5c07b 100644
@@ -583,10 +583,26 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 			 * If either that or op not supported returned, follow
 			 * the normal lookup.
 			 */
-			if ((rc == 0) || (rc == -ENOENT))
+			switch (rc) {
+			case 0:
+				/*
+				 * The server may allow us to open things like
+				 * FIFOs, but the client isn't set up to deal
+				 * with that. If it's not a regular file, just
+				 * close it and proceed as if it were a normal
+				 * lookup.
+				 */
+				if (newInode && !S_ISREG(newInode->i_mode)) {
+					CIFSSMBClose(xid, pTcon, fileHandle);
+					break;
+				}
+			case -ENOENT:
 				posix_open = true;
-			else if ((rc == -EINVAL) || (rc != -EOPNOTSUPP))
+			case -EOPNOTSUPP:
+				break;
+			default:
 				pTcon->broken_posix_open = true;
+			}
 		}
 		if (!posix_open)
 			rc = cifs_get_inode_info_unix(&newInode, full_path,
include/linux/compat.h +4 -0
index 846bb17..edaf390 100644
@@ -561,5 +561,9 @@ extern ssize_t compat_rw_copy_check_uvector(int type,
 
 extern void __user *compat_alloc_user_space(unsigned long len);
 
+#else
+
+#define is_compat_task() (0)
+
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */
include/linux/regset.h +8 -2
index 8abee65..686f373 100644
@@ -335,8 +335,11 @@ static inline int copy_regset_to_user(struct task_struct *target,
 {
 	const struct user_regset *regset = &view->regsets[setno];
 
+	if (!regset->get)
+		return -EOPNOTSUPP;
+
 	if (!access_ok(VERIFY_WRITE, data, size))
-		return -EIO;
+		return -EFAULT;
 
 	return regset->get(target, regset, offset, size, NULL, data);
 }
@@ -358,8 +361,11 @@ static inline int copy_regset_from_user(struct task_struct *target,
 {
 	const struct user_regset *regset = &view->regsets[setno];
 
+	if (!regset->set)
+		return -EOPNOTSUPP;
+
 	if (!access_ok(VERIFY_READ, data, size))
-		return -EIO;
+		return -EFAULT;
 
 	return regset->set(target, regset, offset, size, NULL, data);
 }
include/video/omapdss.h +5 -0
index 892b97f..c0d8014 100644
@@ -514,6 +514,11 @@ struct omap_dss_device {
 	int (*get_backlight)(struct omap_dss_device *dssdev);
 };
 
+struct omap_dss_hdmi_data
+{
+	int hpd_gpio;
+};
+
 struct omap_dss_driver {
 	struct device_driver driver;
 
kernel/irq/manage.c +38 -6

58 lines not on this page · raw message

kernel/kprobes.c +2 -2
index 749340c..f1dcde4 100644
@@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
 		ri->task = current;
 
 		if (rp->entry_handler && rp->entry_handler(ri, regs)) {
-			raw_spin_lock_irqsave(&rp->lock, flags);
+			spin_lock_irqsave(&rp->lock, flags);
 			hlist_add_head(&ri->hlist, &rp->free_instances);
-			raw_spin_unlock_irqrestore(&rp->lock, flags);
+			spin_unlock_irqrestore(&rp->lock, flags);
 			return 0;
 		}
 
mm/huge_memory.c +3 -3
index 78a83e7..8cc11dd 100644
@@ -641,6 +641,7 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm,
 		set_pmd_at(mm, haddr, pmd, entry);
 		prepare_pmd_huge_pte(pgtable, mm);
 		add_mm_counter(mm, MM_ANONPAGES, HPAGE_PMD_NR);
+		mm->nr_ptes++;
 		spin_unlock(&mm->page_table_lock);
 	}
 
@@ -759,6 +760,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 	pmd = pmd_mkold(pmd_wrprotect(pmd));
 	set_pmd_at(dst_mm, addr, dst_pmd, pmd);
 	prepare_pmd_huge_pte(pgtable, dst_mm);
+	dst_mm->nr_ptes++;
 
 	ret = 0;
 out_unlock:
@@ -857,7 +859,6 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm,
 	}
 	kfree(pages);
 
-	mm->nr_ptes++;
 	smp_wmb(); /* make pte visible before pmd */
 	pmd_populate(mm, pmd, pgtable);
 	page_remove_rmap(page);
@@ -1016,6 +1017,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 			VM_BUG_ON(page_mapcount(page) < 0);
 			add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR);
 			VM_BUG_ON(!PageHead(page));
+			tlb->mm->nr_ptes--;
 			spin_unlock(&tlb->mm->page_table_lock);
 			tlb_remove_page(tlb, page);
 			pte_free(tlb->mm, pgtable);
@@ -1310,7 +1312,6 @@ static int __split_huge_page_map(struct page *page,
 			pte_unmap(pte);
 		}
 
-		mm->nr_ptes++;
 		smp_wmb(); /* make pte visible before pmd */
 		/*
 		 * Up to this point the pmd is present and huge and
@@ -1925,7 +1926,6 @@ static void collapse_huge_page(struct mm_struct *mm,
 	set_pmd_at(mm, address, pmd, _pmd);
 	update_mmu_cache(vma, address, entry);
 	prepare_pmd_huge_pte(pgtable, mm);
-	mm->nr_ptes--;
 	spin_unlock(&mm->page_table_lock);
 
 #ifndef CONFIG_NUMA
mm/memcontrol.c +4 -1
index 3791581..45059db 100644
@@ -4558,6 +4558,9 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
 	 */
 	BUG_ON(!thresholds);
 
+	if (!thresholds->primary)
+		goto unlock;
+
 	usage = mem_cgroup_usage(memcg, type == _MEMSWAP);
 
 	/* Check if a threshold crossed before removing */
@@ -4606,7 +4609,7 @@ swap_buffers:
 
 	/* To be sure that nobody uses thresholds */
 	synchronize_rcu();
-
+unlock:
 	mutex_unlock(&memcg->thresholds_lock);
 }
 
mm/nommu.c +0 -2
index 8397758..5ff9b35 100644
@@ -780,8 +780,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
 
 	if (vma->vm_next)
 		vma->vm_next->vm_prev = vma->vm_prev;
-
-	vma->vm_mm = NULL;
 }
 
 /*
net/mac80211/rate.c +1 -1
index 3d5a2cb..816590b 100644
@@ -314,7 +314,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
 	for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
 		info->control.rates[i].idx = -1;
 		info->control.rates[i].flags = 0;
-		info->control.rates[i].count = 1;
+		info->control.rates[i].count = 0;
 	}
 
 	if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
sound/pci/hda/hda_codec.c +6 -2
index 67d341f..39e1a6a 100644
@@ -1651,7 +1651,11 @@ static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
 	parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;
 	parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;
 	parm |= index << AC_AMP_SET_INDEX_SHIFT;
-	parm |= val;
+	if ((val & HDA_AMP_MUTE) && !(info->amp_caps & AC_AMPCAP_MUTE) &&
+	    (info->amp_caps & AC_AMPCAP_MIN_MUTE))
+		; /* set the zero value as a fake mute */
+	else
+		parm |= val;
 	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
 	info->vol[ch] = val;
 }
@@ -1918,7 +1922,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
 	val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT);
 	val1 += ofs;
 	val1 = ((int)val1) * ((int)val2);
-	if (min_mute)
+	if (min_mute || (caps & AC_AMPCAP_MIN_MUTE))
 		val2 |= TLV_DB_SCALE_MUTE;
 	if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))
 		return -EFAULT;
sound/pci/hda/hda_codec.h +3 -0
index 59c9730..eff1fc5 100644
@@ -302,6 +302,9 @@ enum {
 #define AC_AMPCAP_MUTE			(1<<31)    /* mute capable */
 #define AC_AMPCAP_MUTE_SHIFT		31
 
+/* driver-specific amp-caps: using bits 24-30 */
+#define AC_AMPCAP_MIN_MUTE		(1 << 30) /* min-volume = mute */
+
 /* Connection list */
 #define AC_CLIST_LENGTH			(0x7f<<0)
 #define AC_CLIST_LONG			(1<<7)
sound/pci/hda/patch_conexant.c +21 -1
index 81ecd6c..4ad20a6 100644
@@ -4127,7 +4127,8 @@ static int cx_auto_add_volume_idx(struct hda_codec *codec, const char *basename,
 		err = snd_hda_ctl_add(codec, nid, kctl);
 		if (err < 0)
 			return err;
-		if (!(query_amp_caps(codec, nid, hda_dir) & AC_AMPCAP_MUTE))
+		if (!(query_amp_caps(codec, nid, hda_dir) &
+		      (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)))
 			break;
 	}
 	return 0;
@@ -4372,6 +4373,22 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
 	.reboot_notify = snd_hda_shutup_pins,
 };
 
+/* add "fake" mute amp-caps to DACs on cx5051 so that mixer mute switches
+ * can be created (bko#42825)
+ */
+static void add_cx5051_fake_mutes(struct hda_codec *codec)
+{
+	static hda_nid_t out_nids[] = {
+		0x10, 0x11, 0
+	};
+	hda_nid_t *p;
+
+	for (p = out_nids; *p; p++)
+		snd_hda_override_amp_caps(codec, *p, HDA_OUTPUT,
+					  AC_AMPCAP_MIN_MUTE |
+					  query_amp_caps(codec, *p, HDA_OUTPUT));
+}
+
 static int patch_conexant_auto(struct hda_codec *codec)
 {
 	struct conexant_spec *spec;
@@ -4390,6 +4407,9 @@ static int patch_conexant_auto(struct hda_codec *codec)
 	case 0x14f15045:
 		spec->single_adc_amp = 1;
 		break;
+	case 0x14f15051:
+		add_cx5051_fake_mutes(codec);
+		break;
 	}
 
 	err = cx_auto_search_adcs(codec);
sound/pci/hda/patch_sigmatel.c +1 -1
index 43d88c7..8670682 100644
@@ -4589,7 +4589,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec)
 		unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN;
 		if (no_hp_sensing(spec, i))
 			continue;
-		if (presence)
+		if (1 /*presence*/)
 			stac92xx_set_pinctl(codec, cfg->hp_pins[i], val);
 #if 0 /* FIXME */
 /* Resetting the pinctl like below may lead to (a sort of) regressions
sound/soc/imx/imx-ssi.c +1 -1
index 61fceb0..3b56254 100644
@@ -112,7 +112,7 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 		break;
 	case SND_SOC_DAIFMT_DSP_A:
 		/* data on rising edge of bclk, frame high 1clk before data */
-		strcr |= SSI_STCR_TFSL | SSI_STCR_TEFS;
+		strcr |= SSI_STCR_TFSL | SSI_STCR_TXBIT0 | SSI_STCR_TEFS;
 		break;
 	}
 
sound/soc/soc-dapm.c +9 -3
index 32ab7fc..058c0a8 100644
@@ -2615,9 +2615,13 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
 	 * standby.
 	 */
 	if (powerdown) {
-		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_PREPARE);
+		if (dapm->bias_level == SND_SOC_BIAS_ON)
+			snd_soc_dapm_set_bias_level(dapm,
+						    SND_SOC_BIAS_PREPARE);
 		dapm_seq_run(dapm, &down_list, 0, false);
-		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY);
+		if (dapm->bias_level == SND_SOC_BIAS_PREPARE)
+			snd_soc_dapm_set_bias_level(dapm,
+						    SND_SOC_BIAS_STANDBY);
 	}
 }
 
@@ -2630,7 +2634,9 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card)
 
 	list_for_each_entry(codec, &card->codec_dev_list, list) {
 		soc_dapm_shutdown_codec(&codec->dapm);
-		snd_soc_dapm_set_bias_level(&codec->dapm, SND_SOC_BIAS_OFF);
+		if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
+			snd_soc_dapm_set_bias_level(&codec->dapm,
+						    SND_SOC_BIAS_OFF);
 	}
 }
 
#2 lore raw

stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Greg KH
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

regards,

Signature · 2 lines
js
suse labs
author maintainer
#3 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

Quoted 5 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

Quoted 7 lines

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Ick. What is the patch that should be applied here to resolve this? I don't remember seeing it go by, but I could have missed it.

thanks,

greg k-h

#13 lore raw
In reply to Greg KH
Quoted 3 lines · Greg KH

I'm announcing the release of the 3.0.24 kernel.

All users of the 3.0 kernel series must upgrade.

Is the word "must" defined anywhere? When I read it, it looks like there are serious patches included in this release, perhaps data integrity or security patches. But "must" has been in an awful lot of these release notes lately, that it makes me wonder if it is boilerplate.

Just curious how to interpret this.

Thanks,
- Chris

#6 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Jiri Slaby
Quoted 5 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

Quoted 7 lines

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Quoted 1 line

regards,

Signature · 5 lines
js

-- 
js
suse labs
author maintainer
#14 lore raw
In reply to Chris Frey
Quoted 6 lines · Chris Frey
Quoted 3 lines · Greg KH

I'm announcing the release of the 3.0.24 kernel.

All users of the 3.0 kernel series must upgrade.

Is the word "must" defined anywhere?

Surely you have a dictionary somewhere?

Quoted 6 lines

When I read it, it looks like there are serious patches included in this release, perhaps data integrity or security patches. But "must" has been in an awful lot of these release notes lately, that it makes me wonder if it is boilerplate.

Just curious how to interpret this.

Interpret it as written please.

thanks,

greg k-h

#4 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Greg KH
Quoted 14 lines · Greg KH
Quoted 5 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

Quoted 7 lines

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 2 lines

Ick. What is the patch that should be applied here to resolve this? I don't remember seeing it go by, but I could have missed it.

Here's the one-liner Heiko sent to me against this issue.

Willy

Quoted 1 line

From 25d31f767ae3a0352b3d553cdea5c38b68bc797c Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Mon, 5 Mar 2012 14:06:38 +0100
Subject: compat: Re-add missing asm/compat.h include to fix compile breakage on s390

From: Heiko Carstens <[email protected]>

For kernels < 3.0 the backport of 048cd4e51d24ebf7f3552226d03c769d6ad91658 "compat: fix compile breakage on s390" will break compilation...

Re-add a single #include <asm/compat.h> in order to fix this.

This patch is _not_ necessary for upstream, only for stable kernels which include the "build fix" mentioned above.

---
 arch/s390/kernel/setup.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/s390/kernel/setup.c +1 -0
index 0b2573a..358e545 100644
@@ -57,6 +57,7 @@
 #include <asm/ptrace.h>
 #include <asm/sections.h>
 #include <asm/ebcdic.h>
+#include <asm/compat.h>
 #include <asm/kvm_virtio.h>
 
 long psw_kernel_bits	= (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |
Signature · 1 line
1.7.2.1.45.g54fbc
author maintainer
#7 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Jiri Slaby
Quoted 14 lines · Jiri Slaby
Quoted 5 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

Quoted 7 lines

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

thanks,

greg k-h

#8 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

Quoted 15 lines · Greg KH
Quoted 14 lines · Jiri Slaby
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 8 lines
Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

Yes, but give me some time to see if it builds properly now.

thanks,

Signature · 1 line
js
author maintainer
#5 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Willy Tarreau
Quoted 15 lines · Willy Tarreau
Quoted 14 lines · Greg KH
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 4 lines
Quoted 2 lines

Ick. What is the patch that should be applied here to resolve this? I don't remember seeing it go by, but I could have missed it.

Here's the one-liner Heiko sent to me against this issue.

Thanks, now queued up.

greg k-h

#9 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Greg KH
Quoted 15 lines · Greg KH
Quoted 14 lines · Jiri Slaby
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 8 lines
Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

This one is declared in arch/s390/include/asm/compat.h:

static inline void __user *compat_ptr(compat_uptr_t uptr)

{
        return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
}

In 2.6.32, fs3270.c include linux/compat.h. In 3.0 it includes asm/compat.h instead. I would have thought the later would have been enough.

Hoping this helps,
Willy

#15 lore raw
In reply to Greg KH
Quoted 11 lines · Greg KH
Quoted 6 lines · Chris Frey
Quoted 3 lines · Greg KH

I'm announcing the release of the 3.0.24 kernel.

All users of the 3.0 kernel series must upgrade.

Is the word "must" defined anywhere?

Surely you have a dictionary somewhere?

Quoted 8 lines
Quoted 6 lines

When I read it, it looks like there are serious patches included in this release, perhaps data integrity or security patches. But "must" has been in an awful lot of these release notes lately, that it makes me wonder if it is boilerplate.

Just curious how to interpret this.

Interpret it as written please.

Perhaps it would help if I phrased my question differently: What kind of bug makes you decide to write "must" instead of something else?

- Chris

#10 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Willy Tarreau
Quoted 27 lines · Willy Tarreau
Quoted 15 lines · Greg KH
Quoted 14 lines · Jiri Slaby
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 8 lines
Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

This one is declared in arch/s390/include/asm/compat.h:

Quoted 7 lines

static inline void __user *compat_ptr(compat_uptr_t uptr)

{
        return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
}

In 2.6.32, fs3270.c include linux/compat.h. In 3.0 it includes asm/compat.h instead. I would have thought the later would have been enough.

But it was changed to linux/compat.h in 3.0.24 -- that's why it doesn't build. So the same fix as for setup.c should help here.

thanks,

Signature · 1 line
js
#16 lore raw
In reply to Chris Frey
Quoted 2 lines · Chris Frey

Perhaps it would help if I phrased my question differently: What kind of bug makes you decide to write "must" instead of something else?

My impression is that Greg does not want to be in the business of deciding which updates are security-critical. Others can make that judgement based on the patches listed.

"All users must upgrade" would generally mean that it is prudent for all users to upgrade, rather than some particular subset of them (e.g., users who have been experiencing build failures).

Hope that helps,
Jonathan

author maintainer
#17 lore raw
In reply to Chris Frey
Quoted 11 lines · Chris Frey
Quoted 8 lines
Quoted 6 lines

When I read it, it looks like there are serious patches included in this release, perhaps data integrity or security patches. But "must" has been in an awful lot of these release notes lately, that it makes me wonder if it is boilerplate.

Just curious how to interpret this.

Interpret it as written please.

Perhaps it would help if I phrased my question differently: What kind of bug makes you decide to write "must" instead of something else?

This has been discussed endlessly in the past, please see the lkml archives for details if you are interested. It all comes down to the issue, how do you classify a bug fix as a specific "kind"[1]?

Is there some reason you don't trust me in my usage of the word "must" here? If so, then please feel free to go through all of the individual patches, which I post, and make the judgement call for yourself.

thanks,

greg k-h

[1] Hint, for the most part, you can't.

#18 lore raw
Quoted 8 lines · Greg KH
Quoted 2 lines · Chris Frey

Perhaps it would help if I phrased my question differently: What kind of bug makes you decide to write "must" instead of something else?

This has been discussed endlessly in the past, please see the lkml archives for details if you are interested. It all comes down to the issue, how do you classify a bug fix as a specific "kind"[1]?

Quoted 5 lines

Is there some reason you don't trust me in my usage of the word "must" here? If so, then please feel free to go through all of the individual patches, which I post, and make the judgement call for yourself.

[1] Hint, for the most part, you can't.

It's not a matter of trust, but of understanding. If, according to your footnote, you do not classify bugs at all (except maybe compile issues, as Jonathan mentioned), then "must" merely implies that "a bug was fixed."

But had you classified bugs, then it would be useful to know what criteria you had used. And if so, it would make sense that such criteria would be documented somewhere.

I had assumed the latter case, but it seems that the former is more accurate.

Thanks, both to you and Jonathan for clarifying my misunderstanding.

- Chris

#11 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

In reply to Jiri Slaby
Quoted 33 lines · Jiri Slaby
Quoted 32 lines · Willy Tarreau
Quoted 15 lines · Greg KH
Quoted 14 lines · Jiri Slaby
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 8 lines
Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

This one is declared in arch/s390/include/asm/compat.h:

static inline void __user *compat_ptr(compat_uptr_t uptr)

{
        return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
}
Quoted 5 lines
Quoted 2 lines

In 2.6.32, fs3270.c include linux/compat.h. In 3.0 it includes asm/compat.h instead. I would have thought the later would have been enough.

But it was changed to linux/compat.h in 3.0.24 -- that's why it doesn't build. So the same fix as for setup.c should help here.

It is attached. With that patch (and the previous one), s390 builds fine now.

thanks,

Signature · 1 line
js

From: Jiri Slaby <[email protected]>
Date: Mon, 5 Mar 2012 14:06:38 +0100
Subject: compat: Re-add missing asm/compat.h include to fix compile breakage on s390

For 3.0 stable kernel the backport of 048cd4e51d24ebf7f3552226d03c769d6ad91658 "compat: fix compile breakage on s390" breaks compilation...

Re-add a single #include <asm/compat.h> in order to fix this.

This patch is _not_ necessary for upstream, only for stable kernels which include the "build fix" mentioned above.

One fix for arch/s390/kernel/setup.c was already sent and applied. But we need a similar patch for drivers/s390/char/fs3270.c.

---
 drivers/s390/char/fs3270.c |    1 +
 2 files changed, 2 insertions(+)
drivers/s390/char/fs3270.c +1 -0
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #include <linux/compat.h>
 
+#include <asm/compat.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
author maintainer
#12 lore raw

Re: stable-3.0: s390 build breakage [was: Linux 3.0.24]

Quoted 34 lines · Jiri Slaby
Quoted 33 lines · Jiri Slaby
Quoted 32 lines · Willy Tarreau
Quoted 15 lines · Greg KH
Quoted 14 lines · Jiri Slaby
Quoted 12 lines · Jiri Slaby
Quoted 1 line · Greg KH

I'm announcing the release of the 3.0.24 kernel.

...

Quoted 1 line

Heiko Carstens (1): compat: fix compile breakage on s390

It looks like we need the same fix as for 2.6.32.59:
arch/s390/kernel/setup.c: In function 'setup_addressing_mode':
arch/s390/kernel/setup.c:328: error: 'PSW32_ASC_PRIMARY' undeclared (first use in this function)
arch/s390/kernel/setup.c:328: error: (Each undeclared identifier is reported only once
arch/s390/kernel/setup.c:328: error: for each function it appears in.)

Quoted 8 lines
Quoted 6 lines

And when that one is fixed, there is another error:
drivers/s390/char/fs3270.c: In function 'fs3270_ioctl':
drivers/s390/char/fs3270.c:335: error: implicit declaration of function 'compat_ptr'
drivers/s390/char/fs3270.c:335: warning: assignment makes pointer from integer without a cast

Ick, have a patch for this?

This one is declared in arch/s390/include/asm/compat.h:

static inline void __user *compat_ptr(compat_uptr_t uptr)

{
        return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
}
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

In 2.6.32, fs3270.c include linux/compat.h. In 3.0 it includes asm/compat.h instead. I would have thought the later would have been enough.

But it was changed to linux/compat.h in 3.0.24 -- that's why it doesn't build. So the same fix as for setup.c should help here.

It is attached. With that patch (and the previous one), s390 builds fine now.

Thanks for the patch, now queued up.

greg k-h