]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:20:40 +0000 (14:20 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

13 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 29 Sep 2011 04:19:23 +0000 (14:19 +1000)]
Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

13 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:16:30 +0000 (14:16 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'

13 years agoMerge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:15:07 +0000 (14:15 +1000)]
Merge remote-tracking branch 'apm/for-next'

13 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:08:47 +0000 (14:08 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

13 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:04:40 +0000 (14:04 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig

13 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 29 Sep 2011 04:01:00 +0000 (14:01 +1000)]
Merge remote-tracking branch 'osd/linux-next'

13 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 29 Sep 2011 03:59:35 +0000 (13:59 +1000)]
Merge remote-tracking branch 'iommu/next'

13 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 29 Sep 2011 03:59:23 +0000 (13:59 +1000)]
Merge remote-tracking branch 'watchdog/master'

13 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:58:42 +0000 (13:58 +1000)]
Merge remote-tracking branch 'agp/agp-next'

13 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 29 Sep 2011 03:52:11 +0000 (13:52 +1000)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:50:47 +0000 (13:50 +1000)]
Merge remote-tracking branch 'voltage/for-next'

13 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:49:28 +0000 (13:49 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

13 years agoMerge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:47:32 +0000 (13:47 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'

13 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:46:09 +0000 (13:46 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

13 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:44:37 +0000 (13:44 +1000)]
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h

13 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:43:12 +0000 (13:43 +1000)]
Merge remote-tracking branch 'md/for-next'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:36:48 +0000 (13:36 +1000)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:36:39 +0000 (13:36 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:35:15 +0000 (13:35 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c

13 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Thu, 29 Sep 2011 03:35:04 +0000 (13:35 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

13 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 29 Sep 2011 03:33:16 +0000 (13:33 +1000)]
Merge remote-tracking branch 'battery/master'

13 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 29 Sep 2011 03:31:43 +0000 (13:31 +1000)]
Merge branch 'quilt/device-mapper'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:29:33 +0000 (13:29 +1000)]
Merge remote-tracking branch 'block/for-next'

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 29 Sep 2011 03:27:45 +0000 (13:27 +1000)]
Merge remote-tracking branch 'input/next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 29 Sep 2011 03:26:26 +0000 (13:26 +1000)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 29 Sep 2011 03:25:08 +0000 (13:25 +1000)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:23:44 +0000 (13:23 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 03:21:41 +0000 (13:21 +1000)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 29 Sep 2011 03:16:09 +0000 (13:16 +1000)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 29 Sep 2011 03:14:50 +0000 (13:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:48:57 +0000 (12:48 +1000)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:47:14 +0000 (12:47 +1000)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:41:21 +0000 (12:41 +1000)]
Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 29 Sep 2011 02:34:50 +0000 (12:34 +1000)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:32:42 +0000 (12:32 +1000)]
Merge remote-tracking branch 'scsi/master'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:32:38 +0000 (12:32 +1000)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:32:32 +0000 (12:32 +1000)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:31:13 +0000 (12:31 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:29:51 +0000 (12:29 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 29 Sep 2011 02:28:34 +0000 (12:28 +1000)]
Merge remote-tracking branch 'libata/NEXT'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:28:29 +0000 (12:28 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:27:04 +0000 (12:27 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:25:23 +0000 (12:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Thu, 29 Sep 2011 02:24:04 +0000 (12:24 +1000)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Thu, 29 Sep 2011 02:22:54 +0000 (12:22 +1000)]
Merge branch 'quilt/kernel-doc'

13 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:21:32 +0000 (12:21 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

13 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 29 Sep 2011 02:20:21 +0000 (12:20 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 29 Sep 2011 02:19:03 +0000 (12:19 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 29 Sep 2011 02:17:52 +0000 (12:17 +1000)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:16:33 +0000 (12:16 +1000)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:15:06 +0000 (12:15 +1000)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:13:53 +0000 (12:13 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:12:24 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:06:28 +0000 (12:06 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:05:16 +0000 (12:05 +1000)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:04:02 +0000 (12:04 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 02:02:36 +0000 (12:02 +1000)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 29 Sep 2011 02:01:25 +0000 (12:01 +1000)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 29 Sep 2011 02:00:15 +0000 (12:00 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 29 Sep 2011 01:59:02 +0000 (11:59 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Thu, 29 Sep 2011 01:57:51 +0000 (11:57 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 29 Sep 2011 01:56:40 +0000 (11:56 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 29 Sep 2011 01:50:24 +0000 (11:50 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 29 Sep 2011 01:49:07 +0000 (11:49 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 29 Sep 2011 01:42:50 +0000 (11:42 +1000)]
Merge remote-tracking branch 'powerpc/next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:41:29 +0000 (11:41 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:40:10 +0000 (11:40 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:38:59 +0000 (11:38 +1000)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Thu, 29 Sep 2011 01:37:45 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ia64/test'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Thu, 29 Sep 2011 01:36:29 +0000 (11:36 +1000)]
Merge branch 'quilt/hexagon'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:35:11 +0000 (11:35 +1000)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 29 Sep 2011 01:33:58 +0000 (11:33 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:30:41 +0000 (11:30 +1000)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:29:20 +0000 (11:29 +1000)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:27:57 +0000 (11:27 +1000)]
Merge remote-tracking branch 'at91/at91-next'

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:26:44 +0000 (11:26 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/mm/dma-mapping.c
arch/arm/plat-mxc/include/mach/gpio.h

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:13:12 +0000 (11:13 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/mmu.c

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 01:11:53 +0000 (11:11 +1000)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 29 Sep 2011 01:10:31 +0000 (11:10 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoARM: EXYNOS4: convert boot_params to atag_offset
Tushar Behera [Mon, 19 Sep 2011 11:09:01 +0000 (20:09 +0900)]
ARM: EXYNOS4: convert boot_params to atag_offset

Based on "ARM: introduce atag_offset to replace boot_params"
by Nicolas Pitre (2bb9839e312ed55a6d5824ffa6077ce3d7d63b1e).

Since boot_params variable is deleted from machine_desc, the variable
is modified in the newer board files.

CC: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: remove sdhci default configuration setup platform helper
Thomas Abraham [Wed, 28 Sep 2011 01:59:34 +0000 (10:59 +0900)]
ARM: SAMSUNG: remove sdhci default configuration setup platform helper

The sdhci platform helper function that sets up the default controller
configuration is removed for all Samsung platforms since such default
controller configuration can be handled by the driver.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoPM / Tracing: Build runtime PM tracepoints if PM_RUNTIME is set
Rafael J. Wysocki [Wed, 28 Sep 2011 19:28:37 +0000 (21:28 +0200)]
PM / Tracing: Build runtime PM tracepoints if PM_RUNTIME is set

Do not build kernel/trace/rpm-traces.c if CONFIG_PM_RUNTIME is not
set, which avoids a build failure.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agoASoC: Also count neighbour checks for supplies
Mark Brown [Wed, 28 Sep 2011 17:20:26 +0000 (18:20 +0100)]
ASoC: Also count neighbour checks for supplies

Missed when the stat was originally added.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 28 Sep 2011 18:19:43 +0000 (20:19 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Allow patching with any vendor/subsystem ids
Takashi Iwai [Wed, 28 Sep 2011 18:12:08 +0000 (20:12 +0200)]
ALSA: hda - Allow patching with any vendor/subsystem ids

In the ugly real world, there area really broken devices that don't set
codec SSID correctly.  In such a case, the ID can be random, thus the
patching won't work reliably.

For applying the patch forcibly to such a device, the driver will skip
the vendor and/or subsystem ID checks when zero or a negative number is
given in [codec] section.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add snoop option
Takashi Iwai [Wed, 28 Sep 2011 15:16:09 +0000 (17:16 +0200)]
ALSA: hda - Add snoop option

Added a new option "snoop" for the traffic control of the HD-audio
controller chip.  When set to 0, the non-snooping mode is used with
the traffic control bit is set in each stream control register.
This may allow better operations in the low power mode, but the actual
implementation is depending pretty much on the chipset.

As already implemented, more or less each chipset has own snoop-control
register bit.  Now this setup refers to the snoop option, too.

Also, a new VIA chipset may require the non-snooping mode when set so
in BIOS.  In such a case, the option value is overridden.

As default, it's still set to snoop=1 for keeping the same behavior as
before.  In near future, it'll be set to 0 as default after checking
it works in every system well.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agocandev: allow SJW user setting for bittiming calculation
Oliver Hartkopp [Wed, 28 Sep 2011 02:50:11 +0000 (02:50 +0000)]
candev: allow SJW user setting for bittiming calculation

This patch adds support for SJW user settings to not set the synchronization
jump width (SJW) to 1 in any case when using the in-kernel bittiming
calculation.

The ip-tool from iproute2 already supports to pass the user defined SJW
value. The given SJW value is sanitized with the controller specific sjw_max
and the calculated tseg2 value. As the SJW can have values up to 4 providing
this value will lead to the maximum possible SJW automatically. A higher SJW
allows higher controller oscillator tolerances.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agonet: sh_eth: move the asm/sh_eth.h to include/linux/
Yoshihiro Shimoda [Tue, 27 Sep 2011 21:49:12 +0000 (21:49 +0000)]
net: sh_eth: move the asm/sh_eth.h to include/linux/

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agosh: modify prototype in sh_eth.h
Yoshihiro Shimoda [Tue, 27 Sep 2011 21:49:05 +0000 (21:49 +0000)]
sh: modify prototype in sh_eth.h

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agonet: sh_eth: use ioremap()
Yoshihiro Shimoda [Tue, 27 Sep 2011 21:48:58 +0000 (21:48 +0000)]
net: sh_eth: use ioremap()

This patch also changes writel/readl to iowrite32/ioread32.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agocan/sja1000: add driver for EMS PCMCIA card
Oliver Hartkopp [Fri, 23 Sep 2011 06:59:48 +0000 (06:59 +0000)]
can/sja1000: add driver for EMS PCMCIA card

This patch adds the driver for the SJA1000 based PCMCIA card 'CPC-Card' from
EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Markus Plessing <plessing@ems-wuensche.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoconnector: add comm change event report to proc connector
Vladimir Zapolskiy [Wed, 21 Sep 2011 09:26:44 +0000 (09:26 +0000)]
connector: add comm change event report to proc connector

Add an event to monitor comm value changes of tasks.  Such an event
becomes vital, if someone desires to control threads of a process in
different manner.

A natural characteristic of threads is its comm value, and helpfully
application developers have an opportunity to change it in runtime.
Reporting about such events via proc connector allows to fine-grain
monitoring and control potentials, for instance a process control daemon
listening to proc connector and following comm value policies can place
specific threads to assigned cgroup partitions.

It might be possible to achieve a pale partial one-shot likeness without
this update, if an application changes comm value of a thread generator
task beforehand, then a new thread is cloned, and after that proc
connector listener gets the fork event and reads new thread's comm value
from procfs stat file, but this change visibly simplifies and extends the
matter.

Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agonet: rps: fix the support for PPPOE
Changli Gao [Tue, 20 Sep 2011 22:36:07 +0000 (22:36 +0000)]
net: rps: fix the support for PPPOE

The upper protocol numbers of PPPOE are different, and should be treated
specially.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoaf_unix: dont send SCM_CREDENTIALS by default
Eric Dumazet [Mon, 19 Sep 2011 05:52:27 +0000 (05:52 +0000)]
af_unix: dont send SCM_CREDENTIALS by default

Since commit 7361c36c5224 (af_unix: Allow credentials to work across
user and pid namespaces) af_unix performance dropped a lot.

This is because we now take a reference on pid and cred in each write(),
and release them in read(), usually done from another process,
eventually from another cpu. This triggers false sharing.

# Events: 154K cycles
#
# Overhead  Command       Shared Object        Symbol
# ........  .......  ..................  .........................
#
    10.40%  hackbench  [kernel.kallsyms]   [k] put_pid
     8.60%  hackbench  [kernel.kallsyms]   [k] unix_stream_recvmsg
     7.87%  hackbench  [kernel.kallsyms]   [k] unix_stream_sendmsg
     6.11%  hackbench  [kernel.kallsyms]   [k] do_raw_spin_lock
     4.95%  hackbench  [kernel.kallsyms]   [k] unix_scm_to_skb
     4.87%  hackbench  [kernel.kallsyms]   [k] pid_nr_ns
     4.34%  hackbench  [kernel.kallsyms]   [k] cred_to_ucred
     2.39%  hackbench  [kernel.kallsyms]   [k] unix_destruct_scm
     2.24%  hackbench  [kernel.kallsyms]   [k] sub_preempt_count
     1.75%  hackbench  [kernel.kallsyms]   [k] fget_light
     1.51%  hackbench  [kernel.kallsyms]   [k]
__mutex_lock_interruptible_slowpath
     1.42%  hackbench  [kernel.kallsyms]   [k] sock_alloc_send_pskb

This patch includes SCM_CREDENTIALS information in a af_unix message/skb
only if requested by the sender, [man 7 unix for details how to include
ancillary data using sendmsg() system call]

Note: This might break buggy applications that expected SCM_CREDENTIAL
from an unaware write() system call, and receiver not using SO_PASSCRED
socket option.

If SOCK_PASSCRED is set on source or destination socket, we still
include credentials for mere write() syscalls.

Performance boost in hackbench : more than 50% gain on a 16 thread
machine (2 quad-core cpus, 2 threads per core)

hackbench 20 thread 2000

4.228 sec instead of 9.102 sec

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoInput: add a driver for TSC-40 serial touchscreen
Sebastian Andrzej Siewior [Wed, 28 Sep 2011 17:04:21 +0000 (10:04 -0700)]
Input: add a driver for TSC-40 serial touchscreen

This patch adds the TSC-40 serial touchscreen driver and should be
compatible with TSC-10 and TSC-25.

The driver was written by Linutronix on behalf of Bachmann electronic GmbH.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
13 years agobootup: move 'usermodehelper_enable()' to the end of do_basic_setup()
Linus Torvalds [Wed, 28 Sep 2011 17:23:44 +0000 (10:23 -0700)]
bootup: move 'usermodehelper_enable()' to the end of do_basic_setup()

Doing it just before starting to call into cpu_idle() made a sick kind
of sense only because the original bug we fixed (see commit
288d5abec831: "Boot up with usermodehelper disabled") was about problems
with some scheduler data structures not being initialized, and they had
better be initialized at that point.

But it really didn't make any other conceptual sense, and doing it after
the initial "schedule()" call for the idle thread actually opened up a
race: what if the main initialization thread did everything without
needing to sleep, and got all the way into user land too? Without
actually having scheduled back to the idle thread?

Now, in normal circumstances that doesn't ever happen, but it looks like
Richard Cochran triggered exactly that on his ARM IXP4xx machines:

  "I have some ARM IXP4xx based machines that use the two on chip MAC
   ports (aka NPEs).  The NPE needs a firmware in order to function.
   Ever since the following commit [that 288d5abec831 one], it is no
   longer possible to bring up the interfaces during the init scripts."

with a call trace showing an ioctl coming from user space. Richard says:

  "The init is busybox, and the startup script does mount, syslogd, and
   then ifup, so that all can go by quickly."

The fix is to move the usermodehelper_enable() into the main 'init'
thread, and just put it after we've done all our initcalls.  By then,
everything really should be up, but we've obviously not actually started
the user-mode portion of init yet.

Reported-and-tested-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branches 'amso1100', 'cxgb4', 'misc', 'mlx4' and 'mthca' into for-next
Roland Dreier [Wed, 28 Sep 2011 16:12:32 +0000 (09:12 -0700)]
Merge branches 'amso1100', 'cxgb4', 'misc', 'mlx4' and 'mthca' into for-next

13 years agoRDMA/ucm: Removed checks for unsigned value < 0
Hefty, Sean [Wed, 7 Sep 2011 23:28:17 +0000 (23:28 +0000)]
RDMA/ucm: Removed checks for unsigned value < 0

cmd is unsigned, no need to check for < 0.  Found by code inspection.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
13 years agoIB/mad: Verify mgmt class in received MADs
Hefty, Sean [Wed, 7 Sep 2011 23:27:26 +0000 (23:27 +0000)]
IB/mad: Verify mgmt class in received MADs

If a received MAD contains an invalid or reserved mgmt class, we will
attempt to access method_table outside of its range.  Add a check to
ensure that mgmt class falls within the handled range.

Found by code inspection.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>