]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:27:34 +0000 (17:27 +1100)]
Merge remote-tracking branch 'battery/master'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:26:19 +0000 (17:26 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:59 +0000 (17:24 +1100)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:56 +0000 (17:24 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

Conflicts:
kernel/debug/debug_core.h

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:07:56 +0000 (17:07 +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 [Mon, 6 Jan 2014 05:58:58 +0000 (16:58 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:27:34 +0000 (16:27 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:25:30 +0000 (16:25 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:17:43 +0000 (16:17 +1100)]
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
Documentation/module-signing.txt

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:16:20 +0000 (16:16 +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 [Mon, 6 Jan 2014 05:15:02 +0000 (16:15 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

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

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

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:11:58 +0000 (16:11 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/drm_stub.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 [Mon, 6 Jan 2014 05:01:34 +0000 (16:01 +1100)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 04:59:45 +0000 (15:59 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:56:55 +0000 (15:56 +1100)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:55:10 +0000 (15:55 +1100)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:53:56 +0000 (15:53 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoRevert "macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats"
Stephen Rothwell [Mon, 6 Jan 2014 04:44:01 +0000 (15:44 +1100)]
Revert "macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats"

This reverts commit cdf3e274cf1b36e9a2fef2d175cabc566af841b2.

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:34:14 +0000 (15:34 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:17:09 +0000 (14:17 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi

10 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 03:16:16 +0000 (14:16 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

10 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:15:28 +0000 (14:15 +1100)]
Merge remote-tracking branch 'dlm/next'

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

Conflicts:
drivers/cpufreq/Kconfig

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:54:27 +0000 (12:54 +1100)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:44:21 +0000 (12:44 +1100)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:43:21 +0000 (12:43 +1100)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:42:29 +0000 (12:42 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:40:14 +0000 (12:40 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:39:26 +0000 (12:39 +1100)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:38:37 +0000 (12:38 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:37:36 +0000 (12:37 +1100)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:28:41 +0000 (12:28 +1100)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:27:19 +0000 (12:27 +1100)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:26:29 +0000 (12:26 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:25:18 +0000 (12:25 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:23:54 +0000 (12:23 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:22:33 +0000 (12:22 +1100)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:21:44 +0000 (12:21 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:54 +0000 (12:20 +1100)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:04 +0000 (12:20 +1100)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:19:16 +0000 (12:19 +1100)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:18:15 +0000 (12:18 +1100)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 6 Jan 2014 01:17:21 +0000 (12:17 +1100)]
Merge remote-tracking branch 'ext3/for_next'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:16:33 +0000 (12:16 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:15:40 +0000 (12:15 +1100)]
Merge remote-tracking branch 'ceph/master'

10 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 6 Jan 2014 01:14:51 +0000 (12:14 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 6 Jan 2014 00:35:45 +0000 (11:35 +1100)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:34:29 +0000 (11:34 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:23:38 +0000 (11:23 +1100)]
Merge remote-tracking branch 'powerpc/next'

10 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:08:10 +0000 (11:08 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

10 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 6 Jan 2014 00:07:20 +0000 (11:07 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:06:31 +0000 (11:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:05:43 +0000 (11:05 +1100)]
Merge remote-tracking branch 'microblaze/next'

10 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:04:54 +0000 (11:04 +1100)]
Merge remote-tracking branch 'metag/for-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:04:06 +0000 (11:04 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:02:50 +0000 (11:02 +1100)]
Merge remote-tracking branch 'm68k/for-next'

10 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:01:48 +0000 (11:01 +1100)]
Merge remote-tracking branch 'ia64/next'

10 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:00:56 +0000 (11:00 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Sun, 5 Jan 2014 23:52:00 +0000 (10:52 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:51:53 +0000 (10:51 +1100)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:51:46 +0000 (10:51 +1100)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Sun, 5 Jan 2014 23:50:49 +0000 (10:50 +1100)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:49:52 +0000 (10:49 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

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

Conflicts:
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
arch/arm/boot/dts/imx51-apf51.dts
arch/arm/boot/dts/imx6q-sabrelite.dts

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:25:54 +0000 (10:25 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:20:29 +0000 (10:20 +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 [Sun, 5 Jan 2014 23:08:55 +0000 (10:08 +1100)]
Merge remote-tracking branch 'arm/for-next'

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

10 years agoMerge remote-tracking branch 'mfd-fixes/master'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:20 +0000 (10:03 +1100)]
Merge remote-tracking branch 'mfd-fixes/master'

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

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:13 +0000 (10:03 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:13 +0000 (10:03 +1100)]
Merge remote-tracking branch 'net/master'

10 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:10 +0000 (10:03 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

10 years agomtd: bcm47xxpart: alternative MAGIC for board_data partition
Rafał Miłecki [Sat, 21 Dec 2013 18:39:12 +0000 (19:39 +0100)]
mtd: bcm47xxpart: alternative MAGIC for board_data partition

Some devices (like WNDR3700v3) have board_data without MPFR magic, some
extra header or extra NVRAM around 0x100. In such case we have to look
for another magic which is BD 0B 0D BD (BD probably stands for Board
Data). It's located "far far away", so instead of extending buffer add
another mtd_read.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
10 years agomtd: bcm47xxpart: find boot partition by CFE magic
Rafał Miłecki [Sat, 21 Dec 2013 18:39:11 +0000 (19:39 +0100)]
mtd: bcm47xxpart: find boot partition by CFE magic

Some devices have even nicer-to-recognize CFE thanks to the magic.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
10 years agomtd: Hide CONFIG_MTD_BLKDEVS from the menu
Ezequiel Garcia [Fri, 13 Dec 2013 13:58:44 +0000 (10:58 -0300)]
mtd: Hide CONFIG_MTD_BLKDEVS from the menu

Make this option a hidden one and get a cleaner configuration.
This option just selects a common infrastructure for MTD-based devices
to expose a block interface. There is no point in allowing a separate
enable/disable.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
[Brian: keep symbol as tristate]
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
10 years agoMerge branch 'acpi-ac'
Rafael J. Wysocki [Sun, 5 Jan 2014 21:54:58 +0000 (22:54 +0100)]
Merge branch 'acpi-ac'

* acpi-ac:
  ACPI / AC: change notification handler type to ACPI_ALL_NOTIFY

10 years agoMerge branch 'acpi-dsm'
Rafael J. Wysocki [Sun, 5 Jan 2014 21:54:11 +0000 (22:54 +0100)]
Merge branch 'acpi-dsm'

* acpi-dsm:
  ACPI / extlog: replace open-coded _DSM code with helper functions
  ACPI / nouveau: replace open-coded _DSM code with helper functions
  nouveau / ACPI: fix memory leak in ACPI _DSM related code
  ACPI / i915: replace open-coded _DSM code with helper functions
  ACPI / i2c-hid: replace open-coded _DSM code with helper functions
  ACPI / TPM: detect PPI features by checking availability of _DSM functions
  ACPI / TPM: replace open-coded _DSM code with helper functions
  ACPI / TPM: match node name instead of full path when searching for TPM device
  PCI / pci-label: treat PCI label with index 0 as valid label
  ACPI / PCI: replace open-coded _DSM code with helper functions
  PCI / pci-label: release allocated ACPI object on error recovery path
  ACPI: introduce helper interfaces for _DSM method
  ACPI / TPM: fix memory leak when walking ACPI namespace

10 years agopoint to the right include file in a comment (left over from a9004abc3)
Toralf Förster [Thu, 12 Dec 2013 18:09:00 +0000 (19:09 +0100)]
point to the right include file in a comment (left over from a9004abc3)

Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
10 years agoNFS: dprintk() should not print negative fileids and inode numbers
Niels de Vos [Tue, 17 Dec 2013 17:20:16 +0000 (18:20 +0100)]
NFS: dprintk() should not print negative fileids and inode numbers

A fileid in NFS is a uint64. There are some occurrences where dprintk()
outputs a signed fileid. This leads to confusion and more difficult to
read debugging (negative fileids matching positive inode numbers).

Signed-off-by: Niels de Vos <ndevos@redhat.com>
CC: Santosh Pradhan <spradhan@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
10 years agonfs: fix dead code of ipv6_addr_scope
Alexander Aring [Sat, 21 Dec 2013 04:39:04 +0000 (05:39 +0100)]
nfs: fix dead code of ipv6_addr_scope

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with
the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with
a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL
is 0x02. So the condition is always false.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
10 years agosunrpc: Fix infinite loop in RPC state machine
Weston Andros Adamson [Tue, 17 Dec 2013 17:16:11 +0000 (12:16 -0500)]
sunrpc: Fix infinite loop in RPC state machine

When a task enters call_refreshresult with status 0 from call_refresh and
!rpcauth_uptodatecred(task) it enters call_refresh again with no rate-limiting
or max number of retries.

Instead of trying forever, make use of the retry path that other errors use.

This only seems to be possible when the crrefresh callback is gss_refresh_null,
which only happens when destroying the context.

To reproduce:

1) mount with sec=krb5 (or sec=sys with krb5 negotiated for non FSID specific
   operations).

2) reboot - the client will be stuck and will need to be hard rebooted

BUG: soft lockup - CPU#0 stuck for 22s! [kworker/0:2:46]
Modules linked in: rpcsec_gss_krb5 nfsv4 nfs fscache ppdev crc32c_intel aesni_intel aes_x86_64 glue_helper lrw gf128mul ablk_helper cryptd serio_raw i2c_piix4 i2c_core e1000 parport_pc parport shpchp nfsd auth_rpcgss oid_registry exportfs nfs_acl lockd sunrpc autofs4 mptspi scsi_transport_spi mptscsih mptbase ata_generic floppy
irq event stamp: 195724
hardirqs last  enabled at (195723): [<ffffffff814a925c>] restore_args+0x0/0x30
hardirqs last disabled at (195724): [<ffffffff814b0a6a>] apic_timer_interrupt+0x6a/0x80
softirqs last  enabled at (195722): [<ffffffff8103f583>] __do_softirq+0x1df/0x276
softirqs last disabled at (195717): [<ffffffff8103f852>] irq_exit+0x53/0x9a
CPU: 0 PID: 46 Comm: kworker/0:2 Not tainted 3.13.0-rc3-branch-dros_testing+ #4
Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013
Workqueue: rpciod rpc_async_schedule [sunrpc]
task: ffff8800799c4260 ti: ffff880079002000 task.ti: ffff880079002000
RIP: 0010:[<ffffffffa0064fd4>]  [<ffffffffa0064fd4>] __rpc_execute+0x8a/0x362 [sunrpc]
RSP: 0018:ffff880079003d18  EFLAGS: 00000246
RAX: 0000000000000005 RBX: 0000000000000007 RCX: 0000000000000007
RDX: 0000000000000007 RSI: ffff88007aecbae8 RDI: ffff8800783d8900
RBP: ffff880079003d78 R08: ffff88006e30e9f8 R09: ffffffffa005a3d7
R10: ffff88006e30e7b0 R11: ffff8800783d8900 R12: ffffffffa006675e
R13: ffff880079003ce8 R14: ffff88006e30e7b0 R15: ffff8800783d8900
FS:  0000000000000000(0000) GS:ffff88007f200000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f3072333000 CR3: 0000000001a0b000 CR4: 00000000001407f0
Stack:
 ffff880079003d98 0000000000000246 0000000000000000 ffff88007a9a4830
 ffff880000000000 ffffffff81073f47 ffff88007f212b00 ffff8800799c4260
 ffff8800783d8988 ffff88007f212b00 ffffe8ffff604800 0000000000000000
Call Trace:
 [<ffffffff81073f47>] ? trace_hardirqs_on_caller+0x145/0x1a1
 [<ffffffffa00652d3>] rpc_async_schedule+0x27/0x32 [sunrpc]
 [<ffffffff81052974>] process_one_work+0x211/0x3a5
 [<ffffffff810528d5>] ? process_one_work+0x172/0x3a5
 [<ffffffff81052eeb>] worker_thread+0x134/0x202
 [<ffffffff81052db7>] ? rescuer_thread+0x280/0x280
 [<ffffffff81052db7>] ? rescuer_thread+0x280/0x280
 [<ffffffff810584a0>] kthread+0xc9/0xd1
 [<ffffffff810583d7>] ? __kthread_parkme+0x61/0x61
 [<ffffffff814afd6c>] ret_from_fork+0x7c/0xb0
 [<ffffffff810583d7>] ? __kthread_parkme+0x61/0x61
Code: e8 87 63 fd e0 c6 05 10 dd 01 00 01 48 8b 43 70 4c 8d 6b 70 45 31 e4 a8 02 0f 85 d5 02 00 00 4c 8b 7b 48 48 c7 43 48 00 00 00 00 <4c> 8b 4b 50 4d 85 ff 75 0c 4d 85 c9 4d 89 cf 0f 84 32 01 00 00

And the output of "rpcdebug -m rpc -s all":

RPC:    61 call_refresh (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refreshresult (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refreshresult (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refresh (status 0)
RPC:    61 call_refreshresult (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refreshresult (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refresh (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0
RPC:    61 call_refreshresult (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 call_refresh (status 0)
RPC:    61 call_refreshresult (status 0)
RPC:    61 refreshing RPCSEC_GSS cred ffff88007a413cf0

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Cc: stable@vger.kernel.org # 2.6.37+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
10 years agoACPI / extlog: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:47:46 +0000 (20:47 +0800)]
ACPI / extlog: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in acpi_extlog driver.
Also mark initialization data and functions with __init and __initdata
to reduce memory footprint.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Chen, Gong <gong.chen@linux.intel.com>
Reviewed-by: Chen, Gong <gong.chen@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / nouveau: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:38:22 +0000 (20:38 +0800)]
ACPI / nouveau: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in nouveau driver.
After analyzing the ACPI _DSM related code, I changed nouveau_optimus_dsm()
to expect a buffer and nouveau_dsm() to expect an integer only.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agonouveau / ACPI: fix memory leak in ACPI _DSM related code
Jiang Liu [Thu, 19 Dec 2013 12:38:21 +0000 (20:38 +0800)]
nouveau / ACPI: fix memory leak in ACPI _DSM related code

Fix memory leak in function nouveau_optimus_dsm() and nouveau_dsm().

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / i915: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:38:20 +0000 (20:38 +0800)]
ACPI / i915: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in i915 driver.

Function intel_dsm() is used to check functions supported by ACPI _DSM
method, but it has strange check for special value 0x80000002. After
digging into nouveau driver, I think the check is copied from nouveau
driver and is useless for i915 driver, so remove it.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / i2c-hid: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:38:19 +0000 (20:38 +0800)]
ACPI / i2c-hid: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in i2c-hid driver.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / TPM: detect PPI features by checking availability of _DSM functions
Jiang Liu [Thu, 19 Dec 2013 12:38:18 +0000 (20:38 +0800)]
ACPI / TPM: detect PPI features by checking availability of _DSM functions

Detecting physical presence interface features by checking availbility
of corresponding ACPI _DSM functions, it should be more accurate than
checking TPM version number.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / TPM: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:38:17 +0000 (20:38 +0800)]
ACPI / TPM: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in TPM driver.

This patch also help to get rid of following warning messages:
[  163.509575] ACPI Error: Incorrect return type [Buffer] requested [Package]
(20130517/nsxfeval-135)

But there is still an warning left.
[  181.637366] ACPI Warning: \_SB_.IIO0.LPC0.TPM_._DSM: Argument #4 type
mismatch - Found [Buffer], ACPI requires [Package] (20130517/nsarguments-95)

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / TPM: match node name instead of full path when searching for TPM device
Jiang Liu [Thu, 19 Dec 2013 12:38:16 +0000 (20:38 +0800)]
ACPI / TPM: match node name instead of full path when searching for TPM device

When searching ACPI object for TPM device, it should match current
ACPI object name instead of the full path.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoPCI / pci-label: treat PCI label with index 0 as valid label
Jiang Liu [Thu, 19 Dec 2013 12:38:14 +0000 (20:38 +0800)]
PCI / pci-label: treat PCI label with index 0 as valid label

Current pci-label driver detects ACPI label by checking label index
returned by ACPI _DSM method, and treats it as valid if label index
is positive. According to ACPI Firmware specification 3.1, zero is
also an valid label index. So change code to detect availability of
ACPI slot label by checking availaiblity of ACPI _DSM function for
PCI label.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI / PCI: replace open-coded _DSM code with helper functions
Jiang Liu [Thu, 19 Dec 2013 12:38:13 +0000 (20:38 +0800)]
ACPI / PCI: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in pci-label driver.
Also enforce more strict checks on objects returned by _DSM method.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoPCI / pci-label: release allocated ACPI object on error recovery path
Jiang Liu [Thu, 19 Dec 2013 12:38:12 +0000 (20:38 +0800)]
PCI / pci-label: release allocated ACPI object on error recovery path

Function dsm_get_label() leaks the returned ACPI object if
obj->package.count is not 2, so fix the possible memory leak.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoACPI: introduce helper interfaces for _DSM method
Jiang Liu [Thu, 19 Dec 2013 12:38:10 +0000 (20:38 +0800)]
ACPI: introduce helper interfaces for _DSM method

There are several drivers making use of ACPI _DSM method to detect
and invoke device specific methods. Currently every driver has
implemented its private version to support ACPI _DSM method.
So this patch introduces three helper functions to support ACPI _DSM
method, which will be used to replace open-coded versions.

It helps to simplify code and improve code readability.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoMerge branch 'acpi-tpm' into acpi-dsm
Rafael J. Wysocki [Sun, 5 Jan 2014 14:55:34 +0000 (15:55 +0100)]
Merge branch 'acpi-tpm' into acpi-dsm