]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 16 Jan 2014 02:57:21 +0000 (13:57 +1100)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm_ppi.c

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:55:03 +0000 (13:55 +1100)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:53:48 +0000 (13:53 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 16 Jan 2014 02:52:27 +0000 (13:52 +1100)]
Merge remote-tracking branch 'battery/master'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:51:11 +0000 (13:51 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:50:12 +0000 (13:50 +1100)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:48:54 +0000 (13:48 +1100)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:48:51 +0000 (13:48 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

Conflicts:
kernel/debug/debug_core.h

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:47:37 +0000 (13:47 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
MAINTAINERS

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:46:14 +0000 (13:46 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'

Conflicts:
drivers/md/dm-thin.c

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:37:14 +0000 (13:37 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/md/raid1.c
drivers/md/raid10.c
fs/btrfs/extent_io.c
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:31:34 +0000 (13:31 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 16 Jan 2014 02:30:15 +0000 (13:30 +1100)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:29:26 +0000 (13:29 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:21:39 +0000 (13:21 +1100)]
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
Documentation/module-signing.txt

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:16:12 +0000 (13:16 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:13:52 +0000 (13:13 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c

10 years agoMerge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:12:26 +0000 (13:12 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:10:46 +0000 (13:10 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_pm.c

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:08:56 +0000 (13:08 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:57:31 +0000 (12:57 +1100)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:56:36 +0000 (12:56 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 01:55:28 +0000 (12:55 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
include/linux/mlx4/device.h

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:54:15 +0000 (12:54 +1100)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:52:26 +0000 (12:52 +1100)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:41:50 +0000 (12:41 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/mips/bcm47xx/setup.c
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:07:04 +0000 (12:07 +1100)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 01:05:58 +0000 (12:05 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

10 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:05:09 +0000 (12:05 +1100)]
Merge remote-tracking branch 'dlm/next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 01:04:21 +0000 (12:04 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

10 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:03:12 +0000 (12:03 +1100)]
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/cpufreq/Kconfig

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:02:05 +0000 (12:02 +1100)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:49:36 +0000 (11:49 +1100)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:48:13 +0000 (11:48 +1100)]
Merge remote-tracking branch 'libata/for-next'

Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
drivers/ata/ahci.c

10 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:40:44 +0000 (11:40 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:39:54 +0000 (11:39 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:38:09 +0000 (11:38 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/go7007/go7007-usb.c

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:37:19 +0000 (11:37 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:36:30 +0000 (11:36 +1100)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:35:32 +0000 (11:35 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:34:30 +0000 (11:34 +1100)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:25:36 +0000 (11:25 +1100)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:23:23 +0000 (11:23 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:22:11 +0000 (11:22 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:20:47 +0000 (11:20 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:19:28 +0000 (11:19 +1100)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:18:39 +0000 (11:18 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:17:47 +0000 (11:17 +1100)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Thu, 16 Jan 2014 00:16:57 +0000 (11:16 +1100)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 16 Jan 2014 00:16:07 +0000 (11:16 +1100)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 16 Jan 2014 00:15:07 +0000 (11:15 +1100)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 16 Jan 2014 00:14:12 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ext3/for_next'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:13:24 +0000 (11:13 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:12:33 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:11:44 +0000 (11:11 +1100)]
Merge remote-tracking branch 'ceph/master'

10 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:10:24 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'

10 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 16 Jan 2014 00:09:36 +0000 (11:09 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:08:45 +0000 (11:08 +1100)]
Merge remote-tracking branch 'uml/next'

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 15 Jan 2014 23:54:43 +0000 (10:54 +1100)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:53:28 +0000 (10:53 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:44:47 +0000 (10:44 +1100)]
Merge remote-tracking branch 'powerpc/next'

10 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 15 Jan 2014 23:43:56 +0000 (10:43 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:42:50 +0000 (10:42 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:42:01 +0000 (10:42 +1100)]
Merge remote-tracking branch 'microblaze/next'

10 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:41:12 +0000 (10:41 +1100)]
Merge remote-tracking branch 'metag/for-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:40:24 +0000 (10:40 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:39:08 +0000 (10:39 +1100)]
Merge remote-tracking branch 'm68k/for-next'

10 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:38:05 +0000 (10:38 +1100)]
Merge remote-tracking branch 'ia64/next'

10 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:37:16 +0000 (10:37 +1100)]
Merge remote-tracking branch 'cris/for-next'

10 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:36:27 +0000 (10:36 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 15 Jan 2014 23:26:11 +0000 (10:26 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:26:04 +0000 (10:26 +1100)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:25:57 +0000 (10:25 +1100)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:25:00 +0000 (10:25 +1100)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:24:01 +0000 (10:24 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:23:03 +0000 (10:23 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:23:00 +0000 (10:23 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:17:34 +0000 (10:17 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig.debug

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:16:17 +0000 (10:16 +1100)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:15:31 +0000 (10:15 +1100)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 15 Jan 2014 23:06:54 +0000 (10:06 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 15 Jan 2014 23:06:52 +0000 (10:06 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 15 Jan 2014 23:06:52 +0000 (10:06 +1100)]
Merge remote-tracking branch 'net/master'

10 years agoMerge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Wed, 15 Jan 2014 23:06:51 +0000 (10:06 +1100)]
Merge remote-tracking branch 'powerpc-merge/merge'

10 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Wed, 15 Jan 2014 23:06:49 +0000 (10:06 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

10 years agogianfar: Fix portabilty issues for ethtool and ptp
Claudiu Manoil [Tue, 14 Jan 2014 13:35:00 +0000 (15:35 +0200)]
gianfar: Fix portabilty issues for ethtool and ptp

Fixes unhandled register write in gianfar_ethtool.c.
Fixes following endianess related functional issues,
reported by sparse as well, i.e.:

gianfar_ethtool.c:1058:33: warning:
    incorrect type in argument 1 (different base types)
    expected unsigned int [unsigned] [usertype] value
    got restricted __be32 [usertype] ip4src

gianfar_ethtool.c:1164:33: warning:
    restricted __be16 degrades to integer

gianfar_ethtool.c:1669:32: warning:
    invalid assignment: ^=
    left side has type restricted __be16
    right side has type int

Solves all the sparse warnings for mixig normal pointers
with __iomem pointers for gianfar_ptp.c, i.e.:
gianfar_ptp.c:163:32: warning:
    incorrect type in argument 1 (different address spaces)
    expected unsigned int [noderef] <asn:2>*addr
    got unsigned int *<noident>

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoksz884x: delete useless variable
Julia Lawall [Mon, 13 Jan 2014 16:17:24 +0000 (17:17 +0100)]
ksz884x: delete useless variable

Delete a variable that is at most only assigned to a constant, but never
used otherwise.  In this code, it is the variable result that is used for
the return code, not rc.

A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
identifier i;
constant c;
@@

-T i;
<... when != i
-i = c;
...>
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoum: Include generic barrier.h
Richard Weinberger [Wed, 15 Jan 2014 19:20:07 +0000 (20:20 +0100)]
um: Include generic barrier.h

...to get smp_store_release().

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
10 years agoum: Remove SKAS3/4 support
Richard Weinberger [Sun, 15 Sep 2013 09:26:48 +0000 (11:26 +0200)]
um: Remove SKAS3/4 support

Signed-off-by: Richard Weinberger <richard@nod.at>
10 years agoum: Removed unused attributes from thread_struct
Richard Weinberger [Fri, 13 Sep 2013 17:25:11 +0000 (19:25 +0200)]
um: Removed unused attributes from thread_struct

temp_stack and mm_count have no users and can be killed.

Signed-off-by: Richard Weinberger <richard@nod.at>
10 years agoMerge branch 'pci/reset' into next
Bjorn Helgaas [Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)]
Merge branch 'pci/reset' into next

* pci/reset:
  vfio-pci: Use pci "try" reset interface
  PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()

10 years agoMerge branch 'pci/locking' into next
Bjorn Helgaas [Wed, 15 Jan 2014 17:53:23 +0000 (10:53 -0700)]
Merge branch 'pci/locking' into next

* pci/locking:
  PCI: Check parent kobject in pci_destroy_dev()
  xen/pcifront: Use global PCI rescan-remove locking
  powerpc/eeh: Use global PCI rescan-remove locking
  MPT / PCI: Use pci_stop_and_remove_bus_device_locked()
  platform / x86: Use global PCI rescan-remove locking
  PCI: hotplug: Use global PCI rescan-remove locking
  pcmcia: Use global PCI rescan-remove locking
  ACPI / hotplug / PCI: Use global PCI rescan-remove locking
  ACPI / PCI: Use global PCI rescan-remove locking in PCI root hotplug
  PCI: Add global pci_lock_rescan_remove()

10 years agoMerge branch 'pci/misc' into next
Bjorn Helgaas [Wed, 15 Jan 2014 17:52:41 +0000 (10:52 -0700)]
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Fix pci_check_and_unmask_intx() comment typos
  PCI: Never treat a VF as a multifunction device

10 years agovfio-pci: Use pci "try" reset interface
Alex Williamson [Wed, 15 Jan 2014 03:45:09 +0000 (20:45 -0700)]
vfio-pci: Use pci "try" reset interface

PCI resets will attempt to take the device_lock for any device to be
reset.  This is a problem if that lock is already held, for instance
in the device remove path.  It's not sufficient to simply kill the
user process or skip the reset if called after .remove as a race could
result in the same deadlock.  Instead, we handle all resets as "best
effort" using the PCI "try" reset interfaces.  This prevents the user
from being able to induce a deadlock by triggering a reset.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
10 years agoPCI: Check parent kobject in pci_destroy_dev()
Rafael J. Wysocki [Tue, 14 Jan 2014 19:04:51 +0000 (12:04 -0700)]
PCI: Check parent kobject in pci_destroy_dev()

If pci_stop_and_remove_bus_device() is run concurrently for a device and
its parent bridge via remove_callback(), both code paths attempt to acquire
pci_rescan_remove_lock.  If the child device removal acquires it first,
there will be no problems.  However, if the parent bridge removal acquires
it first, it will eventually execute pci_destroy_dev() for the child
device, but that device object will not be freed yet due to the reference
held by the concurrent child removal.  Consequently, both
pci_stop_bus_device() and pci_remove_bus_device() will be executed for that
device unnecessarily and pci_destroy_dev() will see a corrupted list head
in that object.  Moreover, an excess put_device() will be executed for that
device in that case which may lead to a use-after-free in the final
kobject_put() done by sysfs_schedule_callback_work().

To avoid that problem, make pci_destroy_dev() check if the device's parent
kobject is NULL, which only happens after device_del() has already run for
it.  Make pci_destroy_dev() return immediately whithout doing anything in
that case.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
10 years agoxen/pcifront: Use global PCI rescan-remove locking
Rafael J. Wysocki [Fri, 10 Jan 2014 14:29:19 +0000 (15:29 +0100)]
xen/pcifront: Use global PCI rescan-remove locking

Multiple race conditions are possible between the Xen pcifront device
addition and removal and the generic PCI device addition and removal that
can be triggered via sysfs.

To avoid those race conditions make the Xen pcifront code use global PCI
rescan-remove locking.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
10 years agopowerpc/eeh: Use global PCI rescan-remove locking
Rafael J. Wysocki [Wed, 15 Jan 2014 13:33:20 +0000 (14:33 +0100)]
powerpc/eeh: Use global PCI rescan-remove locking

Race conditions are theoretically possible between the PCI device addition
and removal in the PPC64 PCI error recovery driver and the generic PCI bus
rescan and device removal that can be triggered via sysfs.

To avoid those race conditions make PPC64 PCI error recovery driver use
global PCI rescan-remove locking around PCI device addition and removal.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
10 years agoMerge branch 'devel-stable' into for-next
Russell King [Wed, 15 Jan 2014 13:58:44 +0000 (13:58 +0000)]
Merge branch 'devel-stable' into for-next