]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
9 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

9 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 02:13:26 +0000 (12:13 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c

9 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)]
Merge remote-tracking branch 'bluetooth/master'

9 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 10 Jun 2014 01:57:37 +0000 (11:57 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
Documentation/driver-model/devres.txt
drivers/hv/channel_mgmt.c
drivers/staging/rtl8821ae/core.c

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

9 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 10 Jun 2014 01:50:56 +0000 (11:50 +1000)]
Merge remote-tracking branch 'slave-dma/next'

9 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:50:49 +0000 (11:50 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

9 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 10 Jun 2014 01:49:50 +0000 (11:49 +1000)]
Merge remote-tracking branch 'thermal/next'

9 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:48:21 +0000 (11:48 +1000)]
Merge remote-tracking branch 'pm/linux-next'

9 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:48:16 +0000 (11:48 +1000)]
Merge remote-tracking branch 'libata/for-next'

9 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:39:12 +0000 (11:39 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

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

9 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:37:52 +0000 (11:37 +1000)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-sensor-hub.c

9 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 10 Jun 2014 01:33:29 +0000 (11:33 +1000)]
Merge remote-tracking branch 'pci/next'

9 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:22:42 +0000 (11:22 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/f2fs/data.c
fs/f2fs/file.c
fs/nfs/direct.c
fs/splice.c

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

9 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:05:34 +0000 (11:05 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

9 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 10 Jun 2014 01:03:25 +0000 (11:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

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

9 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:59:32 +0000 (10:59 +1000)]
Merge remote-tracking branch 'logfs/master'

9 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 10 Jun 2014 00:59:21 +0000 (10:59 +1000)]
Merge remote-tracking branch 'fscache/fscache'

9 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)]
Merge remote-tracking branch 'f2fs/dev'

9 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 10 Jun 2014 00:57:24 +0000 (10:57 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

9 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:56:24 +0000 (10:56 +1000)]
Merge remote-tracking branch 'cifs/for-next'

9 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:55:02 +0000 (10:55 +1000)]
Merge remote-tracking branch 'ceph/master'

9 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Tue, 10 Jun 2014 00:53:58 +0000 (10:53 +1000)]
Merge remote-tracking branch 'btrfs/next'

9 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 10 Jun 2014 00:53:02 +0000 (10:53 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

9 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Tue, 10 Jun 2014 00:52:06 +0000 (10:52 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

9 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:51:08 +0000 (10:51 +1000)]
Merge remote-tracking branch 'tile/master'

9 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:43:26 +0000 (10:43 +1000)]
Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h

9 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 10 Jun 2014 00:40:29 +0000 (10:40 +1000)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/include/asm/sections.h
arch/powerpc/include/asm/topology.h

9 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:38:56 +0000 (10:38 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

9 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:38:30 +0000 (10:38 +1000)]
Merge remote-tracking branch 'tegra/for-next'

9 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:37:21 +0000 (10:37 +1000)]
Merge remote-tracking branch 'samsung/for-next'

9 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 10 Jun 2014 00:37:16 +0000 (10:37 +1000)]
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts

9 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:35:56 +0000 (10:35 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

9 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:34:46 +0000 (10:34 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

9 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:34:33 +0000 (10:34 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

9 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:34:29 +0000 (10:34 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

9 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:33:31 +0000 (10:33 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

9 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 10 Jun 2014 00:32:38 +0000 (10:32 +1000)]
Merge remote-tracking branch 'arc/for-next'

9 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:27:03 +0000 (10:27 +1000)]
Merge remote-tracking branch 'ide/master'

9 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 10 Jun 2014 00:26:59 +0000 (10:26 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

9 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 10 Jun 2014 00:26:54 +0000 (10:26 +1000)]
Merge remote-tracking branch 'net/master'

9 years agoMerge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next
Michal Marek [Mon, 9 Jun 2014 22:44:21 +0000 (00:44 +0200)]
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next

Conflicts:
scripts/Makefile.host (trivial context conflict)

9 years agokbuild: create include/config directory in scripts/kconfig/Makefile
Masahiro Yamada [Thu, 29 May 2014 05:33:03 +0000 (14:33 +0900)]
kbuild: create include/config directory in scripts/kconfig/Makefile

The directory include/config is used only for
silentoldconfig, localmodconfig, localyesconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agokbuild: do not create include/linux directory
Masahiro Yamada [Thu, 29 May 2014 05:33:02 +0000 (14:33 +0900)]
kbuild: do not create include/linux directory

There are no generated files under include/linux directory.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agoMerge branch 'pm-cpufreq'
Rafael J. Wysocki [Mon, 9 Jun 2014 22:09:45 +0000 (00:09 +0200)]
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
  cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'

9 years agoMerge branch 'pm-general'
Rafael J. Wysocki [Mon, 9 Jun 2014 22:09:36 +0000 (00:09 +0200)]
Merge branch 'pm-general'

* pm-general:
  PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt

9 years agokbuild: trivial - remove trailing empty lines
Masahiro Yamada [Thu, 29 May 2014 05:12:29 +0000 (14:12 +0900)]
kbuild: trivial - remove trailing empty lines

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoMerge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Linus Torvalds [Mon, 9 Jun 2014 22:03:33 +0000 (15:03 -0700)]
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
 "A lot of activities on cgroup side.  Heavy restructuring including
  locking simplification took place to improve the code base and enable
  implementation of the unified hierarchy, which currently exists behind
  a __DEVEL__ mount option.  The core support is mostly complete but
  individual controllers need further work.  To explain the design and
  rationales of the the unified hierarchy

        Documentation/cgroups/unified-hierarchy.txt

  is added.

  Another notable change is css (cgroup_subsys_state - what each
  controller uses to identify and interact with a cgroup) iteration
  update.  This is part of continuing updates on css object lifetime and
  visibility.  cgroup started with reference count draining on removal
  way back and is now reaching a point where csses behave and are
  iterated like normal refcnted objects albeit with some complexities to
  allow distinguishing the state where they're being deleted.  The css
  iteration update isn't taken advantage of yet but is planned to be
  used to simplify memcg significantly"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (77 commits)
  cgroup: disallow disabled controllers on the default hierarchy
  cgroup: don't destroy the default root
  cgroup: disallow debug controller on the default hierarchy
  cgroup: clean up MAINTAINERS entries
  cgroup: implement css_tryget()
  device_cgroup: use css_has_online_children() instead of has_children()
  cgroup: convert cgroup_has_live_children() into css_has_online_children()
  cgroup: use CSS_ONLINE instead of CGRP_DEAD
  cgroup: iterate cgroup_subsys_states directly
  cgroup: introduce CSS_RELEASED and reduce css iteration fallback window
  cgroup: move cgroup->serial_nr into cgroup_subsys_state
  cgroup: link all cgroup_subsys_states in their sibling lists
  cgroup: move cgroup->sibling and ->children into cgroup_subsys_state
  cgroup: remove cgroup->parent
  device_cgroup: remove direct access to cgroup->children
  memcg: update memcg_has_children() to use css_next_child()
  memcg: remove tasks/children test from mem_cgroup_force_empty()
  cgroup: remove css_parent()
  cgroup: skip refcnting on normal root csses and cgrp_dfl_root self css
  cgroup: use cgroup->self.refcnt for cgroup refcnting
  ...

9 years agoMerge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Linus Torvalds [Mon, 9 Jun 2014 21:58:36 +0000 (14:58 -0700)]
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata updates from Tejun Heo:
 "Nothing too interesting - another ahci platform driver variant,
  additional controller support, minor fixes and cleanups"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add Device ID for HighPoint RocketRaid 642L
  ata: ep93xx: use dmaengine_prep_slave_sg api instead of internal callback
  ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
  sata_fsl: remove check for CONFIG_MPC8315_DS
  ahci: add support for Hisilicon sata
  libahci_platform: add host_flags parameter in ahci_platform_init_host()
  ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
  ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
  ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
  Documentation: dt-bindings: reformat and order list of ahci-platform compatibles
  libata-sff: remove dead code
  ata: SATL compliance for Inquiry Product Revision
  pata_octeon_cf: use devm_kzalloc() to allocate cf_port

9 years agoMerge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Linus Torvalds [Mon, 9 Jun 2014 21:56:49 +0000 (14:56 -0700)]
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:
 "Lai simplified worker destruction path and internal workqueue locking
  and there are some other minor changes.

  Except for the removal of some long-deprecated interfaces which
  haven't had any in-kernel user for quite a while, there shouldn't be
  any difference to workqueue users"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
  workqueue: remove the confusing POOL_FREEZING
  workqueue: rename first_worker() to first_idle_worker()
  workqueue: remove unused work_clear_pending()
  workqueue: remove unused WORK_CPU_END
  workqueue: declare system_highpri_wq
  workqueue: use generic attach/detach routine for rescuers
  workqueue: separate pool-attaching code out from create_worker()
  workqueue: rename manager_mutex to attach_mutex
  workqueue: narrow the protection range of manager_mutex
  workqueue: convert worker_idr to worker_ida
  workqueue: separate iteration role from worker_idr
  workqueue: destroy worker directly in the idle timeout handler
  workqueue: async worker destruction
  workqueue: destroy_worker() should destroy idle workers only
  workqueue: use manager lock only to protect worker_idr
  workqueue: Remove deprecated system_nrt[_freezable]_wq
  workqueue: Remove deprecated flush[_delayed]_work_sync()
  kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
  workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's

9 years agoMerge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Mon, 9 Jun 2014 21:56:07 +0000 (14:56 -0700)]
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu updates from Tejun Heo:
 "Nothing too exciting.  percpu_ref is going through some interface
  changes and getting new features with more changes in the pipeline but
  given its young age and few users, it's very low impact"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu-refcount: implement percpu_ref_tryget()
  percpu-refcount: rename percpu_ref_tryget() to percpu_ref_tryget_live()
  percpu: Replace __get_cpu_var with this_cpu_ptr

9 years agococcinelle: Check for missing NULL terminators in of_device_id tables
Stephen Boyd [Tue, 3 Jun 2014 18:25:27 +0000 (20:25 +0200)]
coccinelle: Check for missing NULL terminators in of_device_id tables

Failure to terminate an of_device_id table can lead to confusing
failures depending on where the compiler places the array. Add a
check to make sure these tables are terminated. Thanks to Mitchel
Humpherys for coming up with the pattern initially.

Cc: Mitchel Humpherys <mitchelh@codeaurora.org>
Cc: Gilles Muller <Gilles.Muller@lip6.fr>
Cc: Nicolas Palix <nicolas.palix@imag.fr>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agoMerge branch 'xfs-misc-fixes-3-for-3.16' into for-next
Dave Chinner [Mon, 9 Jun 2014 21:32:56 +0000 (07:32 +1000)]
Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next

9 years agoMerge branch 'xfs-da-geom' into for-next
Dave Chinner [Mon, 9 Jun 2014 21:32:41 +0000 (07:32 +1000)]
Merge branch 'xfs-da-geom' into for-next

9 years agoxfs: fix xfs_da_args sparse warning in xfs_readdir
Dave Chinner [Mon, 9 Jun 2014 21:30:36 +0000 (07:30 +1000)]
xfs: fix xfs_da_args sparse warning in xfs_readdir

The kbuild test robot reported:

>> fs/xfs/xfs_dir2_readdir.c:672:41: sparse: Using plain integer as NULL pointer

Fix it.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
9 years agoMakefile: Fix unrecognized cross-compiler command line options
Geert Uytterhoeven [Tue, 27 May 2014 07:54:12 +0000 (09:54 +0200)]
Makefile: Fix unrecognized cross-compiler command line options

On architectures that setup CROSS_COMPILE in their arch/*/Makefile
(arc, blackfin, m68k, mips, parisc, score, sh, tile, unicore32, xtensa),
cc-option and cc-disable-warning may check against the wrong compiler,
causing errors like

    cc1: error: unrecognized command line option "-Wno-maybe-uninitialized"

if the host gcc supports a compiler option, while the cross compiler
doesn't support that option.

Move all logic using cc-option or cc-disable-warning below the inclusion
of the arch's Makefile to fix this.

Introduced by
  - commit e74fc973b6e531fef1fce8b101ffff05ecfb774c ("Turn off
    -Wmaybe-uninitialized when building with -Os"),
  - commit 61163efae02040f66a95c8ed17f4407951ba58fa ("kbuild: LLVMLinux:
    Add Kbuild support for building kernel with Clang").

As -Wno-maybe-uninitialized requires a quite recent gcc (gcc 4.6.3 on
Ubuntu 12.04 LTS doesn't support it), this only showed up recently (gcc
4.8.2 on Ubuntu 14.04 LTS does support it).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agokbuild: do not add "selinux" to subdir- twice
Masahiro Yamada [Thu, 17 Apr 2014 02:47:47 +0000 (11:47 +0900)]
kbuild: do not add "selinux" to subdir- twice

scripts/Makefile adds "selinux" to subdir-y or subdir- twice.

  subdir-$(CONFIG_MODVERSIONS) += genksyms
  subdir-y                     += mod
  subdir-$(CONFIG_SECURITY_SELINUX) += selinux    <--- here
  subdir-$(CONFIG_DTC)         += dtc

  # Let clean descend into subdirs
  subdir- += basic kconfig package selinux        <--- again

The latter is redundant.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agoscripts/tags.sh: ignore symlink'ed source files
Yann Droneaud [Wed, 21 May 2014 13:32:17 +0000 (15:32 +0200)]
scripts/tags.sh: ignore symlink'ed source files

Since commit 22d651dcef536c75f75537290bf3da5038e68b6b ('selftests/powerpc:
Import Anton's memcpy / copy_tofrom_user tests'), some source files in the
tree appear as symlink.
Until commit 8c38a5328af8080bc69a25b3e4e144b03eeea95e ('scripts/tags.sh:
ignore code of user space tools'), those symlinks made cscope report some
warnings:

    $ make ALLSOURCE_ARCHS=all O=./obj-cscope/ cscope
      GEN     cscope
    cscope: cannot find
file .../tools/testing/selftests/powerpc/copyloops/copyuser_power7.S
    cscope: cannot find
file .../tools/testing/selftests/powerpc/copyloops/memcpy_64.S
    cscope: cannot find
file .../tools/testing/selftests/powerpc/copyloops/memcpy_power7.S
    cscope: cannot find
file .../tools/testing/selftests/powerpc/copyloops/copyuser_64.S

In order to prevent the same kind of warnings to be triggered by future
addition of symlinks, the best option is to ignore all symlinks when
building the file list to be processed by cscope (and other tools
supported by scripts/tags.sh).

Ignoring symlinks won't hide source files from cscope (and others) as the
target of these symlinks already appear somewhere else in the tree, and,
as such, should be processed by cscope (or others).

Note that, cscope, when used with -R option to make it find the files to
process by itself, already skip symlinks: it's not expected that cscope
access source files through symlink.

On top of commit 8c38a5328af8080bc69a25b3e4e144b03eeea95e ('scripts/tags.sh:
ignore code of user space tools'), scripts/tags.sh output from
"make cscope tags TAGS" is the same with and without this patch: it doesn't
seems to introduce any regression (on Fedora 20).

Link: http://lkml.kernel.org/r/1396530975.4361.28.camel@localhost.localdomain
Link: http://mid.gmane.org/534312F8.5090609@t-online.de
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hans-Bernhard Bröker <broeker@users.sourceforge.net>,
Cc: Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de>,
Cc: Neil Horman <nhorman@users.sourceforge.net>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Gerhard Sittig <gsi@denx.de>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
9 years agocpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
Viresh Kumar [Mon, 9 Jun 2014 13:36:17 +0000 (19:06 +0530)]
cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag

Sometimes boot loaders set CPU frequency to a value outside of frequency table
present with cpufreq core. In such cases CPU might be unstable if it has to run
on that frequency for long duration of time and so its better to set it to a
frequency which is specified in frequency table.

Sachin recently found this problem with cpufreq-cpu0 driver when he was testing
it for Exynos.

Set this flag for cpufreq-cpu0 driver.

Reported-and-tested-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
9 years agoPM / Documentation: Update copyright in suspend-and-cpuhotplug.txt
Srivatsa S. Bhat [Mon, 9 Jun 2014 12:31:42 +0000 (18:01 +0530)]
PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt

Extend the year to 2014 in the copyright.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
9 years agoMerge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5',...
Roland Dreier [Mon, 9 Jun 2014 17:17:24 +0000 (10:17 -0700)]
Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next

9 years agoIB/mlx4: Fix gfp passing in create_qp_common()
Jiri Kosina [Mon, 9 Jun 2014 14:36:33 +0000 (16:36 +0200)]
IB/mlx4: Fix gfp passing in create_qp_common()

There are two kzalloc() calls which were not converted to use value of
gfp passed to create_qp_common() instead of using hardcoded GFP_KERNEL
in 40f2287bd583 ("IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO").  Fix
this by passing gfp value down properly.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Roland Dreier <roland@purestorage.com>
9 years agoRDMA/cxgb4: Add support for iWARP Port Mapper user space service
Steve Wise [Wed, 26 Mar 2014 22:08:09 +0000 (17:08 -0500)]
RDMA/cxgb4: Add support for iWARP Port Mapper user space service

Based on original work by Vipul Pandya.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
[ Fix htons -> ntohs to make sparse happy.  - Roland ]

Signed-off-by: Roland Dreier <roland@purestorage.com>
9 years agoRDMA/nes: Add support for iWARP Port Mapper user space service
Tatyana Nikolova [Wed, 26 Mar 2014 22:07:57 +0000 (17:07 -0500)]
RDMA/nes: Add support for iWARP Port Mapper user space service

Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
9 years agoRDMA/core: Add support for iWARP Port Mapper user space service
Tatyana Nikolova [Wed, 26 Mar 2014 22:07:35 +0000 (17:07 -0500)]
RDMA/core: Add support for iWARP Port Mapper user space service

This patch adds iWARP Port Mapper (IWPM) Version 2 support.  The iWARP
Port Mapper implementation is based on the port mapper specification
section in the Sockets Direct Protocol paper -
http://www.rdmaconsortium.org/home/draft-pinkerton-iwarp-sdp-v1.0.pdf

Existing iWARP RDMA providers use the same IP address as the native
TCP/IP stack when creating RDMA connections.  They need a mechanism to
claim the TCP ports used for RDMA connections to prevent TCP port
collisions when other host applications use TCP ports.  The iWARP Port
Mapper provides a standard mechanism to accomplish this.  Without this
service it is possible for RDMA application to bind/listen on the same
port which is already being used by native TCP host application.  If
that happens the incoming TCP connection data can be passed to the
RDMA stack with error.

The iWARP Port Mapper solution doesn't contain any changes to the
existing network stack in the kernel space.  All the changes are
contained with the infiniband tree and also in user space.

The iWARP Port Mapper service is implemented as a user space daemon
process.  Source for the IWPM service is located at
http://git.openfabrics.org/git?p=~tnikolova/libiwpm-1.0.0/.git;a=summary

The iWARP driver (port mapper client) sends to the IWPM service the
local IP address and TCP port it has received from the RDMA
application, when starting a connection.  The IWPM service performs a
socket bind from user space to get an available TCP port, called a
mapped port, and communicates it back to the client.  In that sense,
the IWPM service is used to map the TCP port, which the RDMA
application uses to any port available from the host TCP port
space. The mapped ports are used in iWARP RDMA connections to avoid
collisions with native TCP stack which is aware that these ports are
taken. When an RDMA connection using a mapped port is terminated, the
client notifies the IWPM service, which then releases the TCP port.

The message exchange between the IWPM service and the iWARP drivers
(between user space and kernel space) is implemented using netlink
sockets.

1) Netlink interface functions are added: ibnl_unicast() and
   ibnl_mulitcast() for sending netlink messages to user space

2) The signature of the existing ibnl_put_msg() is changed to be more
   generic

3) Two netlink clients are added: RDMA_NL_NES, RDMA_NL_C4IW
   corresponding to the two iWarp drivers - nes and cxgb4 which use
   the IWPM service

4) Enums are added to enumerate the attributes in the netlink
   messages, which are exchanged between the user space IWPM service
   and the iWARP drivers

Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off by: Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com>

[ Fold in range checking fixes and nlh_next removal as suggested by Dan
  Carpenter and Steve Wise.  Fix sparse endianness in hash.  - Roland ]

Signed-off-by: Roland Dreier <roland@purestorage.com>
9 years agoMerge branch 'for-linus' into next
Vinod Koul [Mon, 9 Jun 2014 16:26:43 +0000 (21:56 +0530)]
Merge branch 'for-linus' into next

9 years agoMerge branch 'topic/xilinx' into for-linus
Vinod Koul [Mon, 9 Jun 2014 16:26:29 +0000 (21:56 +0530)]
Merge branch 'topic/xilinx' into for-linus

9 years agoMerge branch 'topic/dw' into for-linus
Vinod Koul [Mon, 9 Jun 2014 16:25:40 +0000 (21:55 +0530)]
Merge branch 'topic/dw' into for-linus

9 years agoNFSv4.1: Fix typo in dprintk
Tom Haynes [Wed, 4 Jun 2014 22:54:57 +0000 (15:54 -0700)]
NFSv4.1: Fix typo in dprintk

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
9 years agoNFSv4.1: Comment is now wrong and redundant to code
Tom Haynes [Wed, 4 Jun 2014 22:36:05 +0000 (15:36 -0700)]
NFSv4.1: Comment is now wrong and redundant to code

The save of the write offset was removed some time ago, so that
part of the comment is bogus.

The remainder is pretty self-evident.

So off with it!

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
9 years agocpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
Viresh Kumar [Mon, 9 Jun 2014 08:51:24 +0000 (14:21 +0530)]
cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'

'copy_prev_load' was recently added by commit: 18b46ab (cpufreq: governor: Be
friendly towards latency-sensitive bursty workloads).

It actually is a bit redundant as we also have 'prev_load' which can store any
integer value and can be used instead of 'copy_prev_load' by setting it zero.

True load can also turn out to be zero during long idle intervals (and hence the
actual value of 'prev_load' and the overloaded value can clash). However this is
not a problem because, if the true load was really zero in the previous
interval, it makes sense to evaluate the load afresh for the current interval
rather than copying the previous load.

So, drop 'copy_prev_load' and use 'prev_load' instead.

Update comments as well to make it more clear.

There is another change here which was probably missed by Srivatsa during the
last version of updates he made. The unlikely in the 'if' statement was covering
only half of the condition and the whole line should actually come under it.

Also checkpatch is made more silent as it was reporting this (--strict option):

CHECK: Alignment should match open parenthesis
+ if (unlikely(wall_time > (2 * sampling_rate) &&
+ j_cdbs->prev_load)) {

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
9 years agoMerge branch 'imx/dt' into for-next
Shawn Guo [Mon, 9 Jun 2014 05:57:35 +0000 (13:57 +0800)]
Merge branch 'imx/dt' into for-next

9 years agoMerge branch 'imx/soc' into for-next
Shawn Guo [Mon, 9 Jun 2014 05:57:16 +0000 (13:57 +0800)]
Merge branch 'imx/soc' into for-next

9 years agoARM: i.MX27 clk: Use of_clk_init() for DT case
Alexander Shiyan [Sat, 7 Jun 2014 16:09:26 +0000 (20:09 +0400)]
ARM: i.MX27 clk: Use of_clk_init() for DT case

Replace .init_time() hook with of_clk_init() for DT targets.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoARM: i.MX27 clk: Separate DT and non-DT init procedure
Alexander Shiyan [Sat, 7 Jun 2014 16:09:25 +0000 (20:09 +0400)]
ARM: i.MX27 clk: Separate DT and non-DT init procedure

This patch separates DT and non-DT clock initialization procedure,
so we can avoid a lot of unneeded clk_register_clkdev() for DT case.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoARM: i.MX: Remove excess variable
Alexander Shiyan [Tue, 27 May 2014 09:04:47 +0000 (13:04 +0400)]
ARM: i.MX: Remove excess variable

Base address for driver is global, there are no need to use
intermediate variable for it.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoARM: i.MX: Use of_clk_get_by_name() for timer clocks for DT case.
Alexander Shiyan [Tue, 27 May 2014 09:04:46 +0000 (13:04 +0400)]
ARM: i.MX: Use of_clk_get_by_name() for timer clocks for DT case.

Use of_clk_get_by_name() for timer clocks for DT case.
This patch eliminates a lot of unneeded clk_register_clkdev()
calls for GPT.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoARM: dts: i.MX35: Add GPT node
Alexander Shiyan [Sat, 7 Jun 2014 12:34:18 +0000 (16:34 +0400)]
ARM: dts: i.MX35: Add GPT node

This patch adds the missing (General Purpose Timer) GPT devicetree node
for i.MX35 CPUs.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoARM: dts: imx6: add missing compatible and clock properties for kpp
Lothar Waßmann [Fri, 6 Jun 2014 11:02:59 +0000 (13:02 +0200)]
ARM: dts: imx6: add missing compatible and clock properties for kpp

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
9 years agoMerge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 8 Jun 2014 21:35:19 +0000 (14:35 -0700)]
Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull 9p fixes from Eric Van Hensbergen:
 "Two bug fixes, one in xattr error path and the other in parsing
  major/minor numbers from devices"

* tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9P: fix return value in v9fs_fid_xattr_set
  fs/9p: adjust sscanf parameters accordingly to the variable types

9 years agonuma,sched: fix load_to_imbalanced logic inversion
Rik van Riel [Sun, 8 Jun 2014 20:55:57 +0000 (16:55 -0400)]
numa,sched: fix load_to_imbalanced logic inversion

This function is supposed to return true if the new load imbalance is
worse than the old one.  It didn't.  I can only hope brown paper bags
are in style.

Now things converge much better on both the 4 node and 8 node systems.

I am not sure why this did not seem to impact specjbb performance on the
4 node system, which is the system I have full-time access to.

This bug was introduced recently, with commit e63da03639cc ("sched/numa:
Allow task switch if load imbalance improves")

Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
9 years agoMerge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Sun, 8 Jun 2014 21:17:39 +0000 (14:17 -0700)]
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-06-06

Please accept this batch of fixes intended for the 3.16 stream.

For the bluetooth bits, Gustavo says:

"Here some more patches for 3.16. We know that Linus already opened the merge
window, but this is fix only pull request, and most of the patches here are
also tagged for stable."

Along with that, Andrea Merello provides a fix for the broken scanning
in the venerable at76c50x driver...
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
9 years agoDon't trigger congestion wait on dirty-but-not-writeout pages
Linus Torvalds [Sun, 8 Jun 2014 21:17:00 +0000 (14:17 -0700)]
Don't trigger congestion wait on dirty-but-not-writeout pages

shrink_inactive_list() used to wait 0.1s to avoid congestion when all
the pages that were isolated from the inactive list were dirty but not
under active writeback.  That makes no real sense, and apparently causes
major interactivity issues under some loads since 3.11.

The ostensible reason for it was to wait for kswapd to start writing
pages, but that seems questionable as well, since the congestion wait
code seems to trigger for kswapd itself as well.  Also, the logic behind
delaying anything when we haven't actually started writeback is not
clear - it only delays actually starting that writeback.

We'll still trigger the congestion waiting if

 (a) the process is kswapd, and we hit pages flagged for immediate
     reclaim

 (b) the process is not kswapd, and the zone backing dev writeback is
     actually congested.

This probably needs to be revisited, but as it is this fixes a reported
regression.

Reported-by: Felipe Contreras <felipe.contreras@gmail.com>
Pinpointed-by: Hillf Danton <dhillf@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
9 years agonet: force a list_del() in unregister_netdevice_many()
Eric Dumazet [Fri, 6 Jun 2014 13:44:03 +0000 (06:44 -0700)]
net: force a list_del() in unregister_netdevice_many()

unregister_netdevice_many() API is error prone and we had too
many bugs because of dangling LIST_HEAD on stacks.

See commit f87e6f47933e3e ("net: dont leave active on stack LIST_HEAD")

In fact, instead of making sure no caller leaves an active list_head,
just force a list_del() in the callee. No one seems to need to access
the list after unregister_netdevice_many()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
9 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
David S. Miller [Sun, 8 Jun 2014 21:07:45 +0000 (14:07 -0700)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-06-08

This series contains updates to i40e and i40evf.

Jesse fixes an issue reported by Eric Dumazet where the driver was not
masking the right bits in the receive descriptor before checking them.
Also fixes TSO accounting since the kernel now can send as much as 32kB
in a single skb->frag[.] entry, even on a system with 4kB pages.

Anjali cleans up registers which are no longer supported.

Akeem cleans up code comments and removes num_msix_entries from the
interrupt setup routine since it was not being used.  Fixes an issue where
FD SB/ATR and NTUPLE configuration status were reported erroneously, so
now the driver reports FDir without further information.  Fixes a coding
error where during the registration for NAPI, the driver was requesting
256 budget.  The max recommended value for this NAPI_POLL_WEIGHT or 64.
Lastly, removed deprecated device IDs because they will not be shipped.

Mitch removes log messages which were redundant so therefore unnecessary.
Also removes a bogus code comment since VF drivers require MSI-X or they
won't get interrupts at all and cleans up the formatting of several log
messages.  Mitch also fixes the possibility of null pointers in VSI, since
not all VSIs have transmit rings.

Shannon ensures to clear the PXE mode bit on each reset after the AdminQ
has been rebuilt.

Catherine bumps the driver versions for i40e and i40evf.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
9 years agoMerge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
Linus Torvalds [Sun, 8 Jun 2014 20:03:35 +0000 (13:03 -0700)]
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:
 "Clean ups and miscellaneous bug fixes, in particular for the new
  collapse_range and zero_range fallocate functions.  In addition,
  improve the scalability of adding and remove inodes from the orphan
  list"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (25 commits)
  ext4: handle symlink properly with inline_data
  ext4: fix wrong assert in ext4_mb_normalize_request()
  ext4: fix zeroing of page during writeback
  ext4: remove unused local variable "stored" from ext4_readdir(...)
  ext4: fix ZERO_RANGE test failure in data journalling
  ext4: reduce contention on s_orphan_lock
  ext4: use sbi in ext4_orphan_{add|del}()
  ext4: use EXT_MAX_BLOCKS in ext4_es_can_be_merged()
  ext4: add missing BUFFER_TRACE before ext4_journal_get_write_access
  ext4: remove unnecessary double parentheses
  ext4: do not destroy ext4_groupinfo_caches if ext4_mb_init() fails
  ext4: make local functions static
  ext4: fix block bitmap validation when bigalloc, ^flex_bg
  ext4: fix block bitmap initialization under sparse_super2
  ext4: find the group descriptors on a 1k-block bigalloc,meta_bg filesystem
  ext4: avoid unneeded lookup when xattr name is invalid
  ext4: fix data integrity sync in ordered mode
  ext4: remove obsoleted check
  ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode
  ext4: fix locking for O_APPEND writes
  ...

9 years agoMerge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel
Linus Torvalds [Sun, 8 Jun 2014 19:27:44 +0000 (12:27 -0700)]
Merge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel

Pull LLVM patches from Behan Webster:
 "Next set of patches to support compiling the kernel with clang.
  They've been soaking in linux-next since the last merge window.

  More still in the works for the next merge window..."

* tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel:
  arm, unwind, LLVMLinux: Enable clang to be used for unwinding the stack
  ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.h
  all: LLVMLinux: Change DWARF flag to support gcc and clang
  net: netfilter: LLVMLinux: vlais-netfilter
  crypto: LLVMLinux: aligned-attribute.patch

9 years agoMerge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sun, 8 Jun 2014 19:26:43 +0000 (12:26 -0700)]
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 vdso build fix from Peter Anvin:
 "This fixes building the vdso code on older Linux systems, and probably
  some non-Linux systems"

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, vdso: Use <tools/le_byteshift.h> for littleendian access

9 years agoMerge branch 'next' (accumulated 3.16 merge window patches) into master
Linus Torvalds [Sun, 8 Jun 2014 18:31:16 +0000 (11:31 -0700)]
Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

9 years agoLinux 3.15 v3.15
Linus Torvalds [Sun, 8 Jun 2014 18:19:54 +0000 (11:19 -0700)]
Linux 3.15

9 years agoRevert "x86/smpboot: Initialize secondary CPU only if master CPU will wait for it"
Linus Torvalds [Sun, 8 Jun 2014 17:09:49 +0000 (10:09 -0700)]
Revert "x86/smpboot: Initialize secondary CPU only if master CPU will wait for it"

This reverts commit 3e1a878b7ccdb31da6d9d2b855c72ad87afeba3f.

It came in very late, and already has one reported failure: Sitsofe
reports that the current tree fails to boot on his EeePC, and bisected
it down to this.  Rather than waste time trying to figure out what's
wrong, just revert it.

Reported-by: Sitsofe Wheeler <sitsofe@gmail.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
9 years agoBluetooth: Use explicit header and body length for L2CAP SKB allocation
Marcel Holtmann [Sun, 8 Jun 2014 09:22:28 +0000 (11:22 +0200)]
Bluetooth: Use explicit header and body length for L2CAP SKB allocation

When allocating the L2CAP SKB for transmission, provide the upper layers
with a clear distinction on what is the header and what is the body
portion of the SKB.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
9 years agoBluetooth: Shrink size of struct l2cap_ctrl fields
Marcel Holtmann [Sun, 8 Jun 2014 08:26:57 +0000 (10:26 +0200)]
Bluetooth: Shrink size of struct l2cap_ctrl fields

The struct l2cap_ctrl fields are wasting an unsigned int when all the
bits can fit into an __u8 field.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
9 years agoBluetooth: Use const for struct l2cap_ops field
Marcel Holtmann [Sun, 8 Jun 2014 08:05:31 +0000 (10:05 +0200)]
Bluetooth: Use const for struct l2cap_ops field

The struct l2cap_ops field should not allow any modifications and thus
it is better declared as const.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
9 years agoi40e/i40evf: Bump build version
Catherine Sullivan [Sat, 10 May 2014 04:49:15 +0000 (04:49 +0000)]
i40e/i40evf: Bump build version

Bump i40e to 0.4.5 and i40evf to 0.9.29.

Change-ID: I9faca5544446518c5425612e733499cf16ef20a1
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
9 years agoi40e/i40evf: remove deprecated device IDs
Jesse Brandeburg [Sat, 10 May 2014 04:49:14 +0000 (04:49 +0000)]
i40e/i40evf: remove deprecated device IDs

Remove two device IDs 1582 and 1573, because they will not be shipped.

Change-ID: Ica2e550b5b21a69e3f353eba2fe5e1c532a548c4
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
9 years agoi40e/i40evf: fix poll weight
Jesse Brandeburg [Sat, 10 May 2014 04:49:13 +0000 (04:49 +0000)]
i40e/i40evf: fix poll weight

Fix a coding error where during the registration for NAPI
the driver requested 256 budget.  The max recommended
value for this is NAPI_POLL_WEIGHT or 64.

Change-ID: I03ea1e2934a84ff1b5d572988b18315d6d91c5c6
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>