]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 6 May 2014 03:31:42 +0000 (13:31 +1000)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 6 May 2014 03:30:50 +0000 (13:30 +1000)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 6 May 2014 03:29:39 +0000 (13:29 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 6 May 2014 03:19:54 +0000 (13:19 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:18:40 +0000 (13:18 +1000)]
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
drivers/regulator/tps65090-regulator.c

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:16:41 +0000 (13:16 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Tue, 6 May 2014 03:15:22 +0000 (13:15 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:17 +0000 (13:14 +1000)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:00 +0000 (13:14 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 6 May 2014 03:12:47 +0000 (13:12 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:09:42 +0000 (13:09 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 6 May 2014 03:08:43 +0000 (13:08 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 6 May 2014 03:07:39 +0000 (13:07 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 6 May 2014 02:59:29 +0000 (12:59 +1000)]
Merge remote-tracking branch 'modules/modules-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:58:25 +0000 (12:58 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:57:21 +0000 (12:57 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:56:23 +0000 (12:56 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 6 May 2014 02:55:02 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:54:10 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Tue, 6 May 2014 02:52:37 +0000 (12:52 +1000)]
Merge remote-tracking branch 'drm/drm-next'

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 6 May 2014 02:51:37 +0000 (12:51 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:14:32 +0000 (12:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:13:40 +0000 (12:13 +1000)]
Merge remote-tracking branch 'mtd/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 6 May 2014 02:12:09 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 6 May 2014 02:01:50 +0000 (12:01 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 6 May 2014 01:56:28 +0000 (11:56 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 6 May 2014 01:55:17 +0000 (11:55 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:53:19 +0000 (11:53 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/mips/loongson/lemote-2f/clock.c

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:52:14 +0000 (11:52 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:50:56 +0000 (11:50 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 6 May 2014 01:50:02 +0000 (11:50 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 6 May 2014 01:49:10 +0000 (11:49 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:47:13 +0000 (11:47 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 6 May 2014 01:43:17 +0000 (11:43 +1000)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:32:50 +0000 (11:32 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/f2fs/file.c

10 years agoMerge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:31:31 +0000 (11:31 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:30:30 +0000 (11:30 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:29:17 +0000 (11:29 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 6 May 2014 01:27:40 +0000 (11:27 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 6 May 2014 01:26:48 +0000 (11:26 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 6 May 2014 01:25:56 +0000 (11:25 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:25:00 +0000 (11:25 +1000)]
Merge remote-tracking branch 'fuse/for-next'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 6 May 2014 01:24:56 +0000 (11:24 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 6 May 2014 01:24:04 +0000 (11:24 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 6 May 2014 01:22:55 +0000 (11:22 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 6 May 2014 01:21:58 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:21:02 +0000 (11:21 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Tue, 6 May 2014 01:20:00 +0000 (11:20 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 6 May 2014 01:19:05 +0000 (11:19 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 6 May 2014 01:18:11 +0000 (11:18 +1000)]
Merge remote-tracking branch 'sparc-next/master'

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 6 May 2014 01:16:52 +0000 (11:16 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 6 May 2014 01:14:06 +0000 (11:14 +1000)]
Merge remote-tracking branch 'powerpc/next'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:13:09 +0000 (11:13 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:12:14 +0000 (11:12 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:11:08 +0000 (11:11 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:10:15 +0000 (11:10 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 6 May 2014 01:09:13 +0000 (11:09 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:08:07 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/Kconfig

10 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 6 May 2014 01:02:38 +0000 (11:02 +1000)]
Merge remote-tracking branch 'keystone/next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:01:36 +0000 (11:01 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 6 May 2014 01:01:28 +0000 (11:01 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:00:35 +0000 (11:00 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:59:40 +0000 (10:59 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 6 May 2014 00:58:50 +0000 (10:58 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

10 years agoMerge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Tue, 6 May 2014 00:57:55 +0000 (10:57 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:55:51 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:55:02 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Tue, 6 May 2014 00:53:42 +0000 (10:53 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

10 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:36 +0000 (10:53 +1000)]
Merge remote-tracking branch 'ide/master'

10 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:35 +0000 (10:53 +1000)]
Merge remote-tracking branch 'crypto-current/master'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 6 May 2014 00:53:32 +0000 (10:53 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 6 May 2014 00:53:29 +0000 (10:53 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:28 +0000 (10:53 +1000)]
Merge remote-tracking branch 'ipsec/master'

Conflicts:
net/ipv4/ip_vti.c

10 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:25 +0000 (10:53 +1000)]
Merge remote-tracking branch 'sparc/master'

10 years agoraid5: add an option to avoid copy data from bio to stripe cache
Shaohua Li [Tue, 29 Apr 2014 11:13:58 +0000 (19:13 +0800)]
raid5: add an option to avoid copy data from bio to stripe cache

The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access
can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity.
data written to disk is from stripe cache, so if upper layer changes bio data,
data written to disk isn't impacted.

In my environment, I can guarantee 2 will not happen. And BDI_CAP_STABLE_WRITES
can guarantee 2 too. For 1, it's not common too. block plug mechanism will
dispatch a bunch of sequentail small requests together. And since I'm using
SSD, I'm using small chunk size. It's rare case stripe cache is really useful.

So I'd like to avoid the copy from bio to stripe cache and it's very helpful
for performance. In my 1M randwrite tests, avoid the copy can increase the
performance more than 30%.

Of course, this shouldn't be enabled by default. It's reported enabling
BDI_CAP_STABLE_WRITES can harm some workloads before, so I added an option to
control it.

Neilb:
  changed BUG_ON to WARN_ON
  Removed some assignments from raid5_build_block which are now not needed.

Signed-off-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: NeilBrown <neilb@suse.de>
10 years agomd: refuse to change shape of array if it is active but read-only
NeilBrown [Mon, 5 May 2014 23:45:05 +0000 (09:45 +1000)]
md: refuse to change shape of array if it is active but read-only

read-only arrays should not be changed.  This includes changing
the level, layout, size, or number of devices.

So reject those changes for readonly arrays.

Signed-off-by: NeilBrown <neilb@suse.de>
10 years agomd: avoid possible spinning md thread at shutdown.
NeilBrown [Mon, 5 May 2014 23:36:08 +0000 (09:36 +1000)]
md: avoid possible spinning md thread at shutdown.

If an md array with externally managed metadata (e.g. DDF or IMSM)
is in use, then we should not set safemode==2 at shutdown because:

1/ this is ineffective: user-space need to be involved in any 'safemode' handling,
2/ The safemode management code doesn't cope with safemode==2 on external metadata
   and md_check_recover enters an infinite loop.

Even at shutdown, an infinite-looping process can be problematic, so this
could cause shutdown to hang.

Cc: stable@vger.kernel.org (any kernel)
Signed-off-by: NeilBrown <neilb@suse.de>
10 years agomd/raid10: call wait_barrier() for each request submitted.
NeilBrown [Mon, 5 May 2014 03:34:37 +0000 (13:34 +1000)]
md/raid10: call wait_barrier() for each request submitted.

wait_barrier() includes a counter, so we must call it precisely once
(unless balanced by allow_barrier()) for each request submitted.

Since
commit 20d0189b1012a37d2533a87fb451f7852f2418d1
    block: Introduce new bio_split()
in 3.14-rc1, we don't call it for the extra requests generated when
we need to split a bio.

When this happens the counter goes negative, any resync/recovery will
never start, and  "mdadm --stop" will hang.

Reported-by: Chris Murphy <lists@colorremedies.com>
Fixes: 20d0189b1012a37d2533a87fb451f7852f2418d1
Cc: stable@vger.kernel.org (3.14+)
Cc: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: NeilBrown <neilb@suse.de>
10 years agoMerge branch 'pm-sleep' into linux-next
Rafael J. Wysocki [Mon, 5 May 2014 23:42:22 +0000 (01:42 +0200)]
Merge branch 'pm-sleep' into linux-next

* pm-sleep:
  PM / hibernate: no kernel_power_off when pm_power_off NULL
  PM / hibernate: use unsigned local variables in swsusp_show_speed()

10 years agoMerge branch 'powercap' into linux-next
Rafael J. Wysocki [Mon, 5 May 2014 23:42:04 +0000 (01:42 +0200)]
Merge branch 'powercap' into linux-next

* powercap:
  powercap / RAPL: add new CPU IDs
  powercap / RAPL: further relax energy counter checks

10 years agoMerge branch 'pm-cpufreq-next' into linux-next
Rafael J. Wysocki [Mon, 5 May 2014 23:41:55 +0000 (01:41 +0200)]
Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: Kconfig: Fix spelling errors
  cpufreq: Make linux-pm@vger.kernel.org official mailing list
  cpufreq: exynos: Use dev_err/info function instead of pr_err/info

10 years agoMerge branch 'acpica-next'
Rafael J. Wysocki [Mon, 5 May 2014 23:40:33 +0000 (01:40 +0200)]
Merge branch 'acpica-next'

* acpica-next: (28 commits)
  ACPICA: Update version to 20140325.
  ACPICA: acpidump: Update man page.
  ACPICA: acpidump: Remove old acpidump source.
  ACPICA: acpidump: Update Makefile to build acpidump from ACPICA.
  ACPICA: acpidump: Update new structures and add missing file.
  ACPICA: acpidump: Add support to generate acpidump release.
  ACPICA: Table Manager: Split tbinstal.c into two files.
  ACPICA: Table Manager: Misc cleanup and renames, no functional change.
  ACPICA: Tables: Add acpi_install_table() API for early table installation.
  ACPICA: Tables: Avoid SSDT installation with acpi_gbl_disable_ssdt_table_load.
  ACPICA: Tables: Cleanup ACPI_TABLE_ORIGIN_xxx flags.
  ACPICA: Tables: Fix table checksums verification before installation.
  ACPICA: Tables: Fix unbalanced table validations.
  ACPICA: Tables: Clean up split INSTALLED/VALIDATED table state logics.
  ACPICA: Tables: Fix multiple ACPI_FREE()s around acpi_tb_add_table().
  ACPICA: Tables: Fix the issues in handling virtual addressed tables.
  ACPICA: Remove indent divergences to reduce maintenance overhead.
  ACPICA: Add a missing field for debug dump of mutex objects.
  ACPICA: Linux-specific header: Add support for PPC64 compilation.
  ACPICA: Clean up comment divergences in aclinux.h
  ...

10 years agoMerge branch 'acpica'
Rafael J. Wysocki [Mon, 5 May 2014 23:40:26 +0000 (01:40 +0200)]
Merge branch 'acpica'

* acpica:
  ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().

10 years agoACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().
Lv Zheng [Wed, 30 Apr 2014 02:05:40 +0000 (10:05 +0800)]
ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().

Linux XSDT validation mechanism backport has introduced a regreession:
  Commit: 671cc68dc61f029d44b43a681356078e02d8dab8
  Subject: ACPICA: Back port and refine validation of the XSDT root table.
There is a pointer still accessed after unmapping.

This patch fixes this issue.  Lv Zheng.

Fixes: 671cc68dc61f (ACPICA: Back port and refine validation of the XSDT root table.)
References: https://bugzilla.kernel.org/show_bug.cgi?id=73911
References: https://bugs.archlinux.org/task/39811
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Reported-and-tested-by: Bruce Chiarelli <mano155@gmail.com>
Reported-and-tested-by: Spyros Stathopoulos <spystath@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Cc: 3.14+ <stable@vger.kernel.org> # 3.14+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
10 years agoMerge branch 'cpufreq-macros'
Rafael J. Wysocki [Mon, 5 May 2014 23:28:31 +0000 (01:28 +0200)]
Merge branch 'cpufreq-macros'

* cpufreq-macros:
  sh: clk: Use cpufreq_for_each_valid_entry macro for iteration
  irda: sh_sir: Use cpufreq_for_each_valid_entry macro for iteration
  thermal: cpu_cooling: Use cpufreq_for_each_valid_entry macro for iteration
  mips: lemote 2f: Use cpufreq_for_each_entry macro for iteration
  mfd: db8500-prcmu: Use cpufreq_for_each_entry macro for iteration
  ARM: davinci: da850: Use cpufreq_for_each_entry macro for iteration
  cpufreq: Use cpufreq_for_each_* macros for frequency table iteration
  cpufreq: Introduce macros for cpufreq_frequency_table iteration

10 years agoMerge branches 'acpi-scan', 'acpi-pad' and 'acpi-tools'
Rafael J. Wysocki [Mon, 5 May 2014 23:28:12 +0000 (01:28 +0200)]
Merge branches 'acpi-scan', 'acpi-pad' and 'acpi-tools'

* acpi-scan:
  ACPI / scan: do not scan fixed hardware on HW-reduced platform

* acpi-pad:
  ACPI / PAD: call schedule() when need_resched() is true

* acpi-tools:
  ACPI / tools: Introduce ec_access.c - tool to access the EC

10 years agoARM: next: document pulls
Olof Johansson [Mon, 5 May 2014 23:16:32 +0000 (16:16 -0700)]
ARM: next: document pulls

Signed-off-by: Olof Johansson <olof@lixom.net>
10 years agoMerge branch 'next/boards' into for-next
Olof Johansson [Mon, 5 May 2014 23:15:31 +0000 (16:15 -0700)]
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

10 years agoMerge branch 'next/dt' into for-next
Olof Johansson [Mon, 5 May 2014 23:15:28 +0000 (16:15 -0700)]
Merge branch 'next/dt' into for-next

* next/dt: (33 commits)
  ARM: shmobile: armadillo-reference dts: Seiko Instruments, Inc is "sii"
  ARM: shmobile: lager dts: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: koelsch dts: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: r8a7790: add IIC(B) cores to dtsi
  ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi
  ARM: shmobile: r8a7790: add IIC0-2 clock macros
  ARM: shmobile: r8a7791: Fix the I2C clocks parents in DT
  ARM: shmobile: r8a7790: Fix the I2C clocks parents in DT
  ARM: shmobile: lager: Correct setting of ethernet PHY LED mode
  ARM: shmobile: armadillo-reference dts: enable RTC
  ARM: shmobile: r8a7791: Add EHCI MSTP clock
  ARM: shmobile: Use r8a7740 suffix for i2c, mmcif, fsi2 compat strings
  ARM: shmobile: koelsch: activate i2c6 bus
  ARM: shmobile: koelsch: make i2c2-pfc node unique
  ARM: shmobile: r8a7791: add IIC(B) cores to dtsi
  ARM: shmobile: r8a7791: add IIC(B) clocks to dtsi
  ARM: shmobile: r8a7791: add IIC0/1 clock macros
  ARM: shmobile: kzm9g-reference dts: Use KEY_* macros for gpio-keys
  ARM: shmobile: armadillo-reference dts: Use KEY_* macros for gpio-keys
  ARM: shmobile: koelsch: Set ethernet PHY LED mode
  ...

10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Linus Torvalds [Mon, 5 May 2014 22:59:46 +0000 (15:59 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:

 1) e1000e computes header length incorrectly wrt vlans, fix from Vlad
    Yasevich.

 2) ns_capable() check in sock_diag netlink code, from Andrew
    Lutomirski.

 3) Fix invalid queue pairs handling in virtio_net, from Amos Kong.

 4) Checksum offloading busted in sxgbe driver due to incorrect
    descriptor layout, fix from Byungho An.

 5) Fix build failure with SMC_DEBUG set to 2 or larger, from Zi Shen
    Lim.

 6) Fix uninitialized A and X registers in BPF interpreter, from Alexei
    Starovoitov.

 7) Fix arch dependencies of candence driver.

 8) Fix netlink capabilities checking tree-wide, from Eric W Biederman.

 9) Don't dump IFLA_VF_PORTS if netlink request didn't ask for it in
    IFLA_EXT_MASK, from David Gibson.

10) IPV6 FIB dump restart doesn't handle table changes that happen
    meanwhile, causing the code to loop forever or emit dups, fix from
    Kumar Sandararajan.

11) Memory leak on VF removal in bnx2x, from Yuval Mintz.

12) Bug fixes for new Altera TSE driver from Vince Bridgers.

13) Fix route lookup key in SCTP, from Xugeng Zhang.

14) Use BH blocking spinlocks in SLIP, as per a similar fix to CAN/SLCAN
    driver.  From Oliver Hartkopp.

15) TCP doesn't bump retransmit counters in some code paths, fix from
    Eric Dumazet.

16) Clamp delayed_ack in tcp_cubic to prevent theoretical divides by
    zero.  Fix from Liu Yu.

17) Fix locking imbalance in error paths of HHF packet scheduler, from
    John Fastabend.

18) Properly reference the transport module when vsock_core_init() runs,
    from Andy King.

19) Fix buffer overflow in cdc_ncm driver, from Bjørn Mork.

20) IP_ECN_decapsulate() doesn't see a correct SKB network header in
    ip_tunnel_rcv(), fix from Ying Cai.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (132 commits)
  net: macb: Fix race between HW and driver
  net: macb: Remove 'unlikely' optimization
  net: macb: Re-enable RX interrupt only when RX is done
  net: macb: Clear interrupt flags
  net: macb: Pass same size to DMA_UNMAP as used for DMA_MAP
  ip_tunnel: Set network header properly for IP_ECN_decapsulate()
  e1000e: Restrict MDIO Slow Mode workaround to relevant parts
  e1000e: Fix issue with link flap on 82579
  e1000e: Expand workaround for 10Mb HD throughput bug
  e1000e: Workaround for dropped packets in Gig/100 speeds on 82579
  net/mlx4_core: Don't issue PCIe speed/width checks for VFs
  net/mlx4_core: Load the Eth driver first
  net/mlx4_core: Fix slave id computation for single port VF
  net/mlx4_core: Adjust port number in qp_attach wrapper when detaching
  net: cdc_ncm: fix buffer overflow
  Altera TSE: ALTERA_TSE should depend on HAS_DMA
  vsock: Make transport the proto owner
  net: sched: lock imbalance in hhf qdisc
  net: mvmdio: Check for a valid interrupt instead of an error
  net phy: Check for aneg completion before setting state to PHY_RUNNING
  ...

10 years agom68k: fix a compiler warning when building for DragonBall
Daniel Palmer [Sat, 5 Apr 2014 08:05:45 +0000 (17:05 +0900)]
m68k: fix a compiler warning when building for DragonBall

In file included from arch/m68k/kernel/setup.c:4:0:
arch/m68k/kernel/setup_no.c:70:0: warning: "CPU_NAME" redefined [enabled by default]
 #define CPU_NAME "MC68VZ328"
 ^
arch/m68k/kernel/setup_no.c:61:0: note: this is the location of the previous definition
 #define CPU_NAME "MC68000"
 ^

Signed-off-by: Daniel Palmer <danieruru@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
10 years agom68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips
Daniel Palmer [Wed, 2 Apr 2014 14:43:12 +0000 (23:43 +0900)]
m68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips

Signed-off-by: Daniel Palmer <danieruru@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
10 years agoMerge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Mon, 5 May 2014 22:51:17 +0000 (15:51 -0700)]
Merge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some small fixes and device ids for 3.15-rc4.

  All have been in linux-next just fine"

* tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: Nokia 5300 should be treated as unusual dev
  USB: Nokia 305 should be treated as unusual dev
  fsl-usb: do not test for PHY_CLK_VALID bit on controller version 1.6
  usb: storage: shuttle_usbat: fix discs being detected twice
  usb: qcserial: add a number of Dell devices
  USB: OHCI: fix problem with global suspend on ATI controllers
  usb: gadget: at91-udc: fix irq and iomem resource retrieval
  usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine
  usb: phy: fsm: update OTG HNP state transition

10 years agoMerge tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Mon, 5 May 2014 22:50:16 +0000 (15:50 -0700)]
Merge tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial fixes from Greg KH:
 "Here are some tty and serial driver fixes for things reported
  recently"

* tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix lockless tty buffer race
  Revert "tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc"
  drivers/tty/hvc: don't free hvc_console_setup after init
  n_tty: Fix n_tty_write crash when echoing in raw mode
  tty: serial: 8250_core.c Bug fix for Exar chips.

10 years agoMerge tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Mon, 5 May 2014 22:49:38 +0000 (15:49 -0700)]
Merge tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging / iio fixes from Greg KH:
 "Here are some small IIO driver fixes for 3.15-rc4 that resolve some
  reported issues"

* tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: adc: Nothing in ADC should be a bool CONFIG
  iio: exynos_adc: use indio_dev->dev structure to handle child nodes
  iio:imu:mpu6050: Fixed segfault in Invensens MPU driver due to null dereference
  staging:iio:ad2s1200 fix missing parenthesis in a for statment.

10 years agoMerge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux
Linus Torvalds [Mon, 5 May 2014 22:36:59 +0000 (15:36 -0700)]
Merge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux

Pull Xtensa fixes from Chris Zankel:
 - Fixes allmodconfig, allnoconfig builds
 - Adds highmem support
 - Enables build-time exception table sorting.

* tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux:
  xtensa: ISS: don't depend on CONFIG_TTY
  xtensa: xt2000: drop redundant sysmem initialization
  xtensa: add support for KC705
  xtensa: xtfpga: introduce SoC I/O bus
  xtensa: add HIGHMEM support
  xtensa: optimize local_flush_tlb_kernel_range
  xtensa: dump sysmem from the bootmem_init
  xtensa: handle memmap kernel option
  xtensa: keep sysmem banks ordered in mem_reserve
  xtensa: keep sysmem banks ordered in add_sysmem_bank
  xtensa: split bootparam and kernel meminfo
  xtensa: enable sorting extable at build time
  xtensa: export __{invalidate,flush}_dcache_range
  xtensa: Export __invalidate_icache_range

10 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
Linus Torvalds [Mon, 5 May 2014 22:17:02 +0000 (15:17 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "First, there is a critical fix for the new primary-affinity function
  that went into -rc1.

  The second batch of patches from Zheng fix a range of problems with
  directory fragmentation, readdir, and a few odds and ends for cephfs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: reserve caps for file layout/lock MDS requests
  ceph: avoid releasing caps that are being used
  ceph: clear directory's completeness when creating file
  libceph: fix non-default values check in apply_primary_affinity()
  ceph: use fpos_cmp() to compare dentry positions
  ceph: check directory's completeness before emitting directory entry

10 years agoMerge branch 'next/drivers' into for-next
Olof Johansson [Mon, 5 May 2014 22:14:00 +0000 (15:14 -0700)]
Merge branch 'next/drivers' into for-next

* next/drivers:
  reset: add driver for socfpga

10 years agoMerge tag 'socfpga-driver-update-for-3.16' of git://git.rocketboards.org/linux-socfpg...
Olof Johansson [Mon, 5 May 2014 22:13:33 +0000 (15:13 -0700)]
Merge tag 'socfpga-driver-update-for-3.16' of git://git.rocketboards.org/linux-socfpga-next into next/drivers

Merge "drivers: Add reset driver for SOCFPGA" from Dinh Nguyen:

Add a reset driver for the SOCFPGA platform.

* tag 'socfpga-driver-update-for-3.16' of git://git.rocketboards.org/linux-socfpga-next:
  reset: add driver for socfpga

Signed-off-by: Olof Johansson <olof@lixom.net>
10 years agoARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
Thomas Petazzoni [Mon, 14 Apr 2014 14:41:18 +0000 (16:41 +0200)]
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

The Marvell Armada 38x platform has a SDHCI interface managed by the
sdhci-pxav3 MMC host driver. It therefore makes sense to enable this
driver in multi_v7_defconfig, which supports the Armada 38x platform.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Olof Johansson <olof@lixom.net>