]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agounicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:17:30 +0000 (22:17 -0400)]
unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
10 years agosparc: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:16:32 +0000 (22:16 -0400)]
sparc: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: sparclinux@vger.kernel.org
10 years agosh: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:15:58 +0000 (22:15 -0400)]
sh: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: linux-sh@vger.kernel.org
10 years agopowerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:15:32 +0000 (22:15 -0400)]
powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: linuxppc-dev@lists.ozlabs.org
10 years agoparisc: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:14:01 +0000 (22:14 -0400)]
parisc: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: "James E.J. Bottomley" <jejb@parisc-linux.org>
CC: Helge Deller <deller@gmx.de>
CC: linux-parisc@vger.kernel.org
10 years agomips: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:13:33 +0000 (22:13 -0400)]
mips: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
10 years agomicroblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:12:28 +0000 (22:12 -0400)]
microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Michal Simek <monstr@monstr.eu>
CC: microblaze-uclinux@itee.uq.edu.au
10 years agom68k: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:10:21 +0000 (22:10 -0400)]
m68k: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked by: Geert Uytterhoeven <geert@linux-m68k.org>
CC: linux-m68k@lists.linux-m68k.org
10 years agoia64: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:08:56 +0000 (22:08 -0400)]
ia64: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Tony Luck <tony.luck@intel.com>
CC: Fenghua Yu <fenghua.yu@intel.com>
CC: linux-ia64@vger.kernel.org
10 years agoarm: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Tue, 8 Oct 2013 02:07:58 +0000 (22:07 -0400)]
arm: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
10 years agoalpha: select ARCH_MIGHT_HAVE_PC_PARPORT
Mark Salter [Mon, 7 Oct 2013 23:51:52 +0000 (19:51 -0400)]
alpha: select ARCH_MIGHT_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select
ARCH_MIGHT_HAVE_PC_PARPORT.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Richard Henderson <rth@twiddle.net>
CC: linux-alpha@vger.kernel.org
10 years agoxfs: remove unused transaction callback variables
Dave Chinner [Mon, 14 Oct 2013 22:17:53 +0000 (09:17 +1100)]
xfs: remove unused transaction callback variables

We don't do callbacks at transaction commit time, no do we have any
infrastructure to set up or run such callbacks, so remove the
variables and typedefs for these operations. If we ever need to add
callbacks, we can reintroduce the variables at that time.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
10 years agoxfs: split dquot buffer operations out
Dave Chinner [Mon, 14 Oct 2013 22:17:52 +0000 (09:17 +1100)]
xfs: split dquot buffer operations out

Parts of userspace want to be able to read and modify dquot buffers
(e.g. xfs_db) so we need to split out the reading and writing of
these buffers so it is easy to shared code with libxfs in userspace.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
10 years agoxfs: unify directory/attribute format definitions
Dave Chinner [Mon, 14 Oct 2013 22:17:51 +0000 (09:17 +1100)]
xfs: unify directory/attribute format definitions

The on-disk format definitions for the directory and attribute
structures are spread across 3 header files right now, only one of
which is dedicated to defining on-disk structures and their
manipulation (xfs_dir2_format.h). Pull all the format definitions
into a single header file - xfs_da_format.h - and switch all the
code over to point at that.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
10 years agoxfs: create a shared header file for format-related information
Dave Chinner [Tue, 22 Oct 2013 23:36:05 +0000 (10:36 +1100)]
xfs: create a shared header file for format-related information

All of the buffer operations structures are needed to be exported
for xfs_db, so move them all to a common location rather than
spreading them all over the place. They are verifying the on-disk
format, so while xfs_format.h might be a good place, it is not part
of the on disk format.

Hence we need to create a new header file that we centralise these
related definitions. Start by moving the bffer operations
structures, and then also move all the other definitions that have
crept into xfs_log_format.h and xfs_format.h as there was no other
shared header file to put them in.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
10 years agoBluetooth: Fix limited discoverable mode for Zeevo modules
Marcel Holtmann [Wed, 23 Oct 2013 15:28:01 +0000 (08:28 -0700)]
Bluetooth: Fix limited discoverable mode for Zeevo modules

There is an old Panasonic module with a Zeevo chip in there that is
not really operating according to Bluetooth core specification when
it comes to setting the IAC LAP for limited discoverable mode.

For reference, this is the vendor information about this module:

  < HCI Command: Read Local Version Information (0x04|0x0001) plen 0
  > HCI Event: Command Complete (0x0e) plen 12
        Read Local Version Information (0x04|0x0001) ncmd 1
          Status: Success (0x00)
          HCI version: Bluetooth 1.2 (0x02) - Revision 196 (0x00c4)
          LMP version: Bluetooth 1.2 (0x02) - Subversion 61 (0x003d)
          Manufacturer: Zeevo, Inc. (18)

The module reports only the support for one IAC at a time. And that
is totally acceptable according to the Bluetooth core specification
since the minimum supported IAC is only one.

  < HCI Command: Read Number of Supported IAC (0x03|0x0038) plen 0
  > HCI Event: Command Complete (0x0e) plen 5
        Read Number of Supported IAC (0x03|0x0038) ncmd 1
          Status: Success (0x00)
          Number of IAC: 1

The problem arises when trying to program two IAC into the module
on a controller that only supports one.

  < HCI Command: Write Current IAC LAP (0x03|0x003a) plen 7
          Number of IAC: 2
          Access code: 0x9e8b00 (Limited Inquiry)
          Access code: 0x9e8b33 (General Inquiry)
  > HCI Event: Command Status (0x0f) plen 4
        Write Current IAC LAP (0x03|0x003a) ncmd 1
          Status: Unknown HCI Command (0x01)

While this looks strange, but according to the Bluetooth core
specification it is a legal operation. The controller has to
ignore the other values and only program as many as it supports.

  This command shall clear any existing IACs and stores Num_Current_IAC
  and the IAC_LAPs in to the controller. If Num_Current_IAC is greater
  than Num_Support_IAC then only the first Num_Support_IAC shall be
  stored in the controller, and a Command Complete event with error
  code Success (0x00) shall be generated.

This specific controller has a bug here and just returns an error. So
in case the number of supported IAC is less than two and the limited
discoverable mode is requested, now only the LIAC is written to
the controller.

  < HCI Command: Write Current IAC LAP (0x03|0x003a) plen 4
          Number of IAC: 1
          Access code: 0x9e8b00 (Limited Inquiry)
  > HCI Event: Command Complete (0x0e) plen 4
        Write Current IAC LAP (0x03|0x003a) ncmd 1
          Status: Success (0x00)

All other controllers that only support one IAC seem to handle this
perfectly fine, but this fix will only write the LIAC for these
controllers as well.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
10 years agoMerge branch 'fixes' into next
Vinod Koul [Wed, 23 Oct 2013 16:23:27 +0000 (21:53 +0530)]
Merge branch 'fixes' into next

10 years agoMAINTAINERS: add to ioatdma maintainer list
Dave Jiang [Tue, 22 Oct 2013 22:29:20 +0000 (15:29 -0700)]
MAINTAINERS: add to ioatdma maintainer list

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
[djbw: add dmaengine list]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
10 years agoMAINTAINERS: add the new dmaengine mailing list
Vinod Koul [Tue, 22 Oct 2013 07:28:56 +0000 (12:58 +0530)]
MAINTAINERS: add the new dmaengine mailing list

We have a new mailing list hosted by vger for dmaengine

Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
10 years agoMerge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:52 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/wm8400' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:51 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:51 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:50 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:49 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:49 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:48 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:47 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:47 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:46 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/spear' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:45 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/sn95031' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:45 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/simple' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:44 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:43 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:43 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:42 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:41 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:41 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:40 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:40 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:39 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:38 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/max9850' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:37 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/max98095' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:37 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/max98088' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:36 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:35 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:35 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:34 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/doc' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:33 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/doc' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/dma' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:33 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/devm' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:32 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:31 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:31 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:30 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:29 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:29 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/core' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:28 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/core' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/component' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:27 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/component' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/bclk' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:27 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:26 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:25 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:25 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:24 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:23 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/adau1373' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:23 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/ab8500' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:22 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
Mark Brown [Wed, 23 Oct 2013 15:44:21 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next

10 years agoMerge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:20 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

10 years agoMerge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:20 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

10 years agoMerge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:19 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus

10 years agoMerge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:19 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus

10 years agoMerge remote-tracking branch 'asoc/fix/omap' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:18 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus

10 years agoMerge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Mark Brown [Wed, 23 Oct 2013 15:44:17 +0000 (16:44 +0100)]
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

10 years agoASoC: davinci-evm: Add device tree binding
Hebbar, Gururaja [Wed, 23 Oct 2013 12:30:14 +0000 (15:30 +0300)]
ASoC: davinci-evm: Add device tree binding

Device tree support for Davinci Machine driver

When the board boots with device tree, the driver will receive card,
codec, dai interface details (like the card name, DAPM routing map,
phandle for the audio components described in the dts file, codec mclk
speed). The card will be set up based on this information. Since the
routing is provided via DT we can mark the card fully routed so core
can take care of disconnecting the unused pins.

Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
10 years agoASoC: davinci-mcasp: Remove last reference to num-serializer in DT doc
Jyri Sarha [Wed, 23 Oct 2013 12:30:15 +0000 (15:30 +0300)]
ASoC: davinci-mcasp: Remove last reference to num-serializer in DT doc

Remove last reference to num-serializer in davinci-mcasp devicetree
binding document.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
10 years agoASoC: davinci: Add support for AM33xx SoC Audio
Hebbar, Gururaja [Wed, 23 Oct 2013 12:30:13 +0000 (15:30 +0300)]
ASoC: davinci: Add support for AM33xx SoC Audio

AM33xx uses same McASP IP as the Davinci Platform. This patch updates
Kconfig and makefile to enable build for McASP, PCM & Codec drivers.

Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
10 years agoMerge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next
Michal Marek [Wed, 23 Oct 2013 15:16:12 +0000 (17:16 +0200)]
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next

10 years agoshow_delta: Update script to support python versions 2.5 through 3.3
Mike Pagano [Wed, 9 Oct 2013 14:36:42 +0000 (10:36 -0400)]
show_delta: Update script to support python versions 2.5 through 3.3

Support past and active versions of python while maintaining backward compatibility. Script has been tested on python versions from 2.5.x up to and including 3.3.x.

Signed-off-by: Mike Pagano <mpagano@gentoo.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
10 years agobatman-adv: generalize batman-adv icmp packet handling
Simon Wunderlich [Tue, 22 Oct 2013 20:50:09 +0000 (22:50 +0200)]
batman-adv: generalize batman-adv icmp packet handling

Instead of handling icmp packets only up to length of icmp_packet_rr,
the code should handle any icmp length size. Therefore the length
truncating is moved to when the packet is actually sent to userspace
(this does not support lengths longer than icmp_packet_rr yet). Longer
packets are forwarded without truncating.

This patch also cleans up some parts where the icmp header struct could
be used instead of other icmp_packet(_rr) structs to make the code more
readable.

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
10 years agobatman-adv: Start new development cycle
Simon Wunderlich [Mon, 14 Oct 2013 16:01:01 +0000 (18:01 +0200)]
batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
10 years agobatman-adv: include the sync-flags when compute the global/local table CRC
Antonio Quartulli [Sun, 13 Oct 2013 00:50:20 +0000 (02:50 +0200)]
batman-adv: include the sync-flags when compute the global/local table CRC

Flags covered by TT_SYNC_MASK are kept in sync among the
nodes in the network and therefore they have to be
considered while computing the global/local table CRC.

In this way a generic originator is able to understand if
its table contains the correct flags or not.

Bits from 4 to 7 in the TT flags fields are now reserved for
"synchronized" flags only.

This allows future developers to add more flags of this type
without breaking compatibility.

It's important to note that not all the remote TT flags are
synchronised. This comes from the fact that some flags are
used to inject an information once only.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
10 years agobatman-adv: improve the TT component to support runtime flag changes
Antonio Quartulli [Sun, 13 Oct 2013 00:50:19 +0000 (02:50 +0200)]
batman-adv: improve the TT component to support runtime flag changes

Some flags (i.e. the WIFI flag) may change after that the
related client has already been announced. However it is
useful to informa the rest of the network about this change.

Add a runtime-flag-switch detection mechanism and
re-announce the related TT entry to advertise the new flag
value.

This mechanism can be easily exploited by future flags that
may need the same treatment.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
10 years agobatman-adv: invoke dev_get_by_index() outside of is_wifi_iface()
Antonio Quartulli [Sun, 13 Oct 2013 00:50:18 +0000 (02:50 +0200)]
batman-adv: invoke dev_get_by_index() outside of is_wifi_iface()

Upcoming changes need to perform other checks on the
incoming net_device struct.

To avoid performing dev_get_by_index() for each and every
check, it is better to move it outside of is_wifi_iface()
and search the netdev object once only.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
10 years agobatman-adv: send GW_DEL event in case of soft-iface destruction
Antonio Quartulli [Mon, 19 Aug 2013 16:39:59 +0000 (18:39 +0200)]
batman-adv: send GW_DEL event in case of soft-iface destruction

In case of soft_iface destruction send a GW DEL event to
userspace so that applications which are listening for GW
events are informed about the lost of connectivity and can
react accordingly.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
10 years agobatman-adv: limit local translation table max size
Marek Lindner [Mon, 27 May 2013 07:33:25 +0000 (15:33 +0800)]
batman-adv: limit local translation table max size

The local translation table size is limited by what can be
transferred from one node to another via a full table request.

The number of entries fitting into a full table request depend
on whether the fragmentation is enabled or not. Therefore this
patch introduces a max table size check and refuses to add
more local clients when that size is reached. Moreover, if the
max full table packet size changes (MTU change or fragmentation
is disabled) the local table is downsized instantaneously.

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Antonio Quartulli <ordex@autistici.org>
10 years agobatman-adv: adapt the TT component to use the new API functions
Antonio Quartulli [Tue, 3 Sep 2013 09:10:24 +0000 (11:10 +0200)]
batman-adv: adapt the TT component to use the new API functions

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: provide orig_node routing API
Antonio Quartulli [Tue, 3 Sep 2013 09:10:23 +0000 (11:10 +0200)]
batman-adv: provide orig_node routing API

Some operations executed on an orig_node depends on the
current routing algorithm being used. To easily make this
mechanism routing algorithm agnostic add a orig_node
specific API that each algorithm can populate with its own
routines.

Such routines are then invoked by the code when needed,
without knowing which routing algorithm is currently in use

With this patch 3 API functions are added:
- orig_free (to free routing depending internal structs)
- orig_add_if (to change the inner state of an orig_node
  when a new hard interface is added)
- orig_del_if (to change the inner state of an orig_node
  when an hard interface is removed)

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agoscripts/coccinelle/api: remove devm_request_and_ioremap.cocci
Wolfram Sang [Thu, 15 Aug 2013 10:30:25 +0000 (12:30 +0200)]
scripts/coccinelle/api: remove devm_request_and_ioremap.cocci

Use of this function is discouraged in favour of
devm_ioremap_resource(). Don't advertise it.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>
10 years agoMakefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default
Sergei Trofimovich [Fri, 13 Sep 2013 21:51:40 +0000 (14:51 -0700)]
Makefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default

The common error found in forward-ported/backported patches is missing
headers.  One recent example (files and function names are mangled):

    void foo(){}
    EXPORT_SYMBOL(foo);

gave only warning

    foo.c:12345678:5: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    void foo(){}
         ^

    foo.c:12345679:5: warning: data definition has no type or storage class [enabled by default]
    EXPORT_SYMBOL(foo);
    foo.c:12345679:5: warning: type defaults to 'int' in declaration of 'EXORT_SYMBOL' [-Werror=implicit-int]

Now it's a fatal error. Tested on x86_64 allyesconfig.

[akpm@linux-foundation.org: fix typos in comments]
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
10 years agobatman-adv: adapt the neighbor purging routine to use the new API functions
Antonio Quartulli [Mon, 2 Sep 2013 10:15:07 +0000 (12:15 +0200)]
batman-adv: adapt the neighbor purging routine to use the new API functions

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: adapt bonding to use the new API functions
Antonio Quartulli [Mon, 2 Sep 2013 10:15:06 +0000 (12:15 +0200)]
batman-adv: adapt bonding to use the new API functions

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: add bat_neigh_is_equiv_or_better API function
Antonio Quartulli [Mon, 2 Sep 2013 10:15:05 +0000 (12:15 +0200)]
batman-adv: add bat_neigh_is_equiv_or_better API function

Each routing protocol has its own metric semantic and
therefore is the protocol itself the only component able to
compare two metrics to check their "similarity".

This new API allows each routing protocol to implement its
own logic and make the external code protocol agnostic.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: add bat_neigh_cmp API function
Antonio Quartulli [Mon, 2 Sep 2013 10:15:04 +0000 (12:15 +0200)]
batman-adv: add bat_neigh_cmp API function

This new API allows to compare the two neighbours based on
the metric avoiding the user to deal with any routing
algorithm specific detail

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: add bat_orig_print API function
Antonio Quartulli [Mon, 2 Sep 2013 10:15:03 +0000 (12:15 +0200)]
batman-adv: add bat_orig_print API function

Each routing protocol has its own metric and private
variables, therefore it is useful to introduce a new API
for originator information printing.

This API needs to be implemented by each protocol in order
to provide its specific originator table output.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: make struct batadv_orig_node algorithm agnostic
Antonio Quartulli [Mon, 2 Sep 2013 10:15:02 +0000 (12:15 +0200)]
batman-adv: make struct batadv_orig_node algorithm agnostic

some of the struct batadv_orig_node members are B.A.T.M.A.N. IV
specific and therefore they are moved in a algorithm specific
substruct in order to make batadv_orig_node routing algorithm
agnostic

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years agobatman-adv: make struct batadv_neigh_node algorithm agnostic
Antonio Quartulli [Mon, 2 Sep 2013 10:15:01 +0000 (12:15 +0200)]
batman-adv: make struct batadv_neigh_node algorithm agnostic

some of the fields in struct batadv_neigh_node are strictly
related to the B.A.T.M.A.N. IV algorithm. In order to
make the struct usable by any routing algorithm it has to be
split and made more generic

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
10 years ago[SCSI] sd: call blk_pm_runtime_init before add_disk
Aaron Lu [Thu, 10 Oct 2013 05:22:36 +0000 (13:22 +0800)]
[SCSI] sd: call blk_pm_runtime_init before add_disk

Sujit has found a race condition that would make q->nr_pending
unbalanced, it occurs as Sujit explained:

"
sd_probe_async() ->
add_disk() ->
disk_add_event() ->
schedule(disk_events_workfn)
sd_revalidate_disk()
blk_pm_runtime_init()
return;

Let's say the disk_events_workfn() calls sd_check_events() which tries
to send test_unit_ready() and because of sd_revalidate_disk() trying to
send another commands the test_unit_ready() might be re-queued as the
tagged command queuing is disabled.

So the race condition is -

Thread 1    | Thread 2
sd_revalidate_disk()   | sd_check_events()
...nr_pending = 0 as q->dev = NULL| scsi_queue_insert()
blk_runtime_pm_init()   |  blk_pm_requeue_request() ->
  | nr_pending = -1 since
  | q->dev != NULL
"

The problem is, the test_unit_ready request doesn't get counted the
first time it is queued, so the later decrement of q->nr_pending in
blk_pm_requeue_request makes it unbalanced.

Fix this by calling blk_pm_runtime_init before add_disk so that all
requests initiated there will all be counted.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Reported-and-tested-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
10 years ago[SCSI] qla2xxx: Fix request queue null dereference.
Chad Dupuis [Thu, 3 Oct 2013 07:21:13 +0000 (03:21 -0400)]
[SCSI] qla2xxx: Fix request queue null dereference.

If an invalid IOCB is returned on the response queue then the index into the
request queue map could be invalid and could return to us a bogus value. This
could cause us to try to deference an invalid pointer and cause an exception.

If we encounter this condition, simply return as no context can be established
for this response.

Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
10 years agoscripts/tags.sh: Increase identifier list
Kirill Tkhai [Wed, 23 Oct 2013 13:08:44 +0000 (15:08 +0200)]
scripts/tags.sh: Increase identifier list

Add __maybe_unused
__always_unused
__cacheline_aligned
__cacheline_aligned_in_smp
ACPI_EXPORT_SYMBOL
to the list.

Signed-off-by: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
10 years agoASoC: tegra: Remove redundant initialisation of compat_filter_fn
Mark Brown [Sat, 19 Oct 2013 13:17:03 +0000 (14:17 +0100)]
ASoC: tegra: Remove redundant initialisation of compat_filter_fn

Setting a field in a static struct to NULL has no effect so don't bother
(and don't generate false positives for grep).

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
10 years agoASoC: ep93xx: Open code dma channel request
Mark Brown [Sat, 19 Oct 2013 13:13:04 +0000 (14:13 +0100)]
ASoC: ep93xx: Open code dma channel request

Currently the ep93xx DMA code is one of the few users relying on the fact
that the compat code uses the dma_data as the filter data for non-DT
channel requests. Since the rest of the core expects this to be a struct
snd_dmaengine_dai_data this isn't terribly helpful this will be changed to
use the already existing filter data so avoid breaking ep93xx by open
coding the current behaviour.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>