Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply fixes on top of newer things
in tree (efi-stub).

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Merge tag 'v3.13-rc4' into next

Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.

Merge tag 'v3.13-rc3' into for-linus

Merging with the mainline to sync up on changes to serio core.

Merge tag 'v3.13-rc3' into drm-intel-next-queued

Linux 3.13-rc3

I need a backmerge for two reasons:
- For merging the ppgtt patches from Ben I need to pull in the bdw
support.
- We now have dupli

Merge tag 'v3.13-rc3' into drm-intel-next-queued

Linux 3.13-rc3

I need a backmerge for two reasons:
- For merging the ppgtt patches from Ben I need to pull in the bdw
support.
- We now have duplicated calls to intel_uncore_forcewake_reset in the
setup code to due 2 different patches merged into -next and 3.13.
The conflict is silen so I need the merge to be able to apply
Deepak's fixup patch.

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

Trivial conflict, it doesn't even show up in the merge diff.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

show more ...

Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal

Merge tag 'v3.13-rc1' into patchwork

Linux 3.13-rc1

* tag 'v3.13-rc1': (11465 commits)
Linux 3.13-rc1
ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
ALSA: hda - Pr

Merge tag 'v3.13-rc1' into patchwork

Linux 3.13-rc1

* tag 'v3.13-rc1': (11465 commits)
Linux 3.13-rc1
ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
ALSA: hda - Provide missing pin configs for VAIO with ALC260
mm: place page->pmd_huge_pte to right union
MAINTAINERS: add keyboard driver to Hyper-V file list
x86, mm: do not leak page->ptl for pmd page tables
ipc,shm: correct error return value in shmctl (SHM_UNLOCK)
mm, mempolicy: silence gcc warning
block/partitions/efi.c: fix bound check
ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown
mm: hugetlbfs: fix hugetlbfs optimization
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
ipc,shm: fix shm_file deletion races
mm: thp: give transparent hugepage code a separate copy_page
checkpatch: fix "Use of uninitialized value" warnings
configfs: fix race between dentry put and lookup
gso: handle new frag_list of frags GRO packets
GFS2: Fix ref count bug relating to atomic_open
genetlink: fix genl_set_err() group ID
genetlink: fix genlmsg_multicast() bug
...

show more ...

Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1

Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few clock fixes, a runtime PM fix, and pinctrl-single fix along

Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few clock fixes, a runtime PM fix, and pinctrl-single fix along
with few other fixes that popped up during the merge window.

* tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
doc: devicetree: Add bindings documentation for omap-des driver
ARM: dts: doc: Document missing compatible property for omap-sham driver
ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
ARM: OMAP: devicetree: fix SPI node compatible property syntax items
pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
+ sync with newer trunk

show more ...

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
"As a first remark I'd like to note that the way to build perf toolin

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
"As a first remark I'd like to note that the way to build perf tooling
has been simplified and sped up, in the future it should be enough for
you to build perf via:

cd tools/perf/
make install

(ie without the -j option.) The build system will figure out the
number of CPUs and will do a parallel build+install.

The various build system inefficiencies and breakages Linus reported
against the v3.12 pull request should now be resolved - please
(re-)report any remaining annoyances or bugs.

Main changes on the perf kernel side:

* Performance optimizations:
. perf ring-buffer code optimizations, by Peter Zijlstra
. perf ring-buffer code optimizations, by Oleg Nesterov
. x86 NMI call-stack processing optimizations, by Peter Zijlstra
. perf context-switch optimizations, by Peter Zijlstra
. perf sampling speedups, by Peter Zijlstra
. x86 Intel PEBS processing speedups, by Peter Zijlstra

* Enhanced hardware support:
. for Intel Ivy Bridge-EP uncore PMUs, by Zheng Yan
. for Haswell transactions, by Andi Kleen, Peter Zijlstra

* Core perf events code enhancements and fixes by Oleg Nesterov:
. for uprobes, if fork() is called with pending ret-probes
. for uprobes platform support code

* New ABI details by Andi Kleen:
. Report x86 Haswell TSX transaction abort cost as weight

Main changes on the perf tooling side (some of these tooling changes
utilize the above kernel side changes):

* 'perf report/top' enhancements:

. Convert callchain children list to rbtree, greatly reducing the
time taken for callchain processing, from Namhyung Kim.

. Add new COMM infrastructure, further improving histogram
processing, from Frédéric Weisbecker, one fix from Namhyung Kim.

. Add /proc/kcore based live-annotation improvements, including
build-id cache support, multi map 'call' instruction navigation
fixes, kcore address validation, objdump workarounds. From
Adrian Hunter.

. Show progress on histogram collapsing, that can take a long
time, from Namhyung Kim.

. Add --max-stack option to limit callchain stack scan in 'top'
and 'report', improving callchain processing when reducing the
stack depth is an option, from Waiman Long.

. Add new option --ignore-vmlinux for perf top, from Willy
Tarreau.

* 'perf trace' enhancements:

. 'perf trace' now can can use a 'perf probe' dynamic tracepoints
to hook into the userspace -> kernel pathname copy so that it
can map fds to pathnames without reading /proc/pid/fd/ symlinks.
From Arnaldo Carvalho de Melo.

. Show VFS path associated with fd in live sessions, using a
'vfs_getname' 'perf probe' created dynamic tracepoint or by
looking at /proc/pid/fd, from Arnaldo Carvalho de Melo.

. Add 'trace' beautifiers for lots of syscall arguments, from
Arnaldo Carvalho de Melo.

. Implement more compact 'trace' output by suppressing zeroed
args, from Arnaldo Carvalho de Melo.

. Show thread COMM by default in 'trace', from Arnaldo Carvalho de
Melo.

. Add option to show full timestamp in 'trace', from David Ahern.

. Add 'record' command in 'trace', to record raw_syscalls:*, from
David Ahern.

. Add summary option to dump syscall statistics in 'trace', from
David Ahern.

. Improve error messages in 'trace', providing hints about system
configuration steps needed for using it, from Ramkumar
Ramachandra.

. 'perf trace' now emits hints as to why tracing is not possible,
helping the user to setup the system to allow tracing in the
desired permission granularity, telling if the problem is due to
debugfs not being mounted or with not enough permission for
!root, /proc/sys/kernel/perf_event_paranoit value, etc. From
Arnaldo Carvalho de Melo.

* 'perf record' enhancements:

. Check maximum frequency rate for record/top, emitting better
error messages, from Jiri Olsa.

. 'perf record' code cleanups, from David Ahern.

. Improve write_output error message in 'perf record', from Adrian
Hunter.

. Allow specifying B/K/M/G unit to the --mmap-pages arguments,
from Jiri Olsa.

. Fix command line callchain attribute tests to handle the new
-g/--call-chain semantics, from Arnaldo Carvalho de Melo.

* 'perf kvm' enhancements:

. Disable live kvm command if timerfd is not supported, from David
Ahern.

. Fix detection of non-core features, from David Ahern.

* 'perf list' enhancements:

. Add usage to 'perf list', from David Ahern.

. Show error in 'perf list' if tracepoints not available, from
Pekka Enberg.

* 'perf probe' enhancements:

. Support "$vars" meta argument syntax for local variables,
allowing asking for all possible variables at a given probe
point to be collected when it hits, from Masami Hiramatsu.

* 'perf sched' enhancements:

. Address the root cause of that 'perf sched' stack initialization
build slowdown, by programmatically setting a big array after
moving the global variable back to the stack. Fix from Adrian
Hunter.

* 'perf script' enhancements:

. Set up output options for in-stream attributes, from Adrian
Hunter.

. Print addr by default for BTS in 'perf script', from Adrian
Juntmer

* 'perf stat' enhancements:

. Improved messages when doing profiling in all or a subset of
CPUs using a workload as the session delimitator, as in:

'perf stat --cpu 0,2 sleep 10s'

from Arnaldo Carvalho de Melo.

. Add units to nanosec-based counters in 'perf stat', from David
Ahern.

. Remove bogus info when using 'perf stat' -e cycles/instructions,
from Ramkumar Ramachandra.

* 'perf lock' enhancements:

. 'perf lock' fixes and cleanups, from Davidlohr Bueso.

* 'perf test' enhancements:

. Fixup PERF_SAMPLE_TRANSACTION handling in sample synthesizing
and 'perf test', from Adrian Hunter.

. Clarify the "sample parsing" test entry, from Arnaldo Carvalho
de Melo.

. Consider PERF_SAMPLE_TRANSACTION in the "sample parsing" test,
from Arnaldo Carvalho de Melo.

. Memory leak fixes in 'perf test', from Felipe Pena.

* 'perf bench' enhancements:

. Change the procps visible command-name of invididual benchmark
tests plus cleanups, from Ingo Molnar.

* Generic perf tooling infrastructure/plumbing changes:

. Separating data file properties from session, code
reorganization from Jiri Olsa.

. Fix version when building out of tree, as when using one of
these:

$ make help | grep perf
perf-tar-src-pkg - Build perf-3.12.0.tar source tarball
perf-targz-src-pkg - Build perf-3.12.0.tar.gz source tarball
perf-tarbz2-src-pkg - Build perf-3.12.0.tar.bz2 source tarball
perf-tarxz-src-pkg - Build perf-3.12.0.tar.xz source tarball
$

from David Ahern.

. Enhance option parse error message, showing just the help lines
of the options affected, from Namhyung Kim.

. libtraceevent updates from upstream trace-cmd repo, from Steven
Rostedt.

. Always use perf_evsel__set_sample_bit to set sample_type, from
Adrian Hunter.

. Memory and mmap leak fixes from Chenggang Qin.

. Assorted build fixes for from David Ahern and Jiri Olsa.

. Speed up and prettify the build system, from Ingo Molnar.

. Implement addr2line directly using libbfd, from Roberto Vitillo.

. Separate the GTK support in a separate libperf-gtk.so DSO, that
is only loaded when --gtk is specified, from Namhyung Kim.

. perf bash completion fixes and improvements from Ramkumar
Ramachandra.

. Support for Openembedded/Yocto -dbg packages, from Ricardo
Ribalda Delgado.

And lots and lots of other fixes and code reorganizations that did not
make it into the list, see the shortlog, diffstat and the Git log for
details!"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (300 commits)
uprobes: Fix the memory out of bound overwrite in copy_insn()
uprobes: Fix the wrong usage of current->utask in uprobe_copy_process()
perf tools: Remove unneeded include
perf record: Remove post_processing_offset variable
perf record: Remove advance_output function
perf record: Refactor feature handling into a separate function
perf trace: Don't relookup fields by name in each sample
perf tools: Fix version when building out of tree
perf evsel: Ditch evsel->handler.data field
uprobes: Export write_opcode() as uprobe_write_opcode()
uprobes: Introduce arch_uprobe->ixol
uprobes: Kill module_init() and module_exit()
uprobes: Move function declarations out of arch
perf/x86/intel: Add Ivy Bridge-EP uncore IRP box support
perf/x86/intel/uncore: Add filter support for IvyBridge-EP QPI boxes
perf: Factor out strncpy() in perf_event_mmap_event()
tools/perf: Add required memory barriers
perf: Fix arch_perf_out_copy_user default
perf: Update a stale comment
perf: Optimize perf_output_begin() -- address calculation
...

show more ...

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

* kcore annotation

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

* kcore annotation improvements, including build-id cache support,
multi map 'call' instruction navigation fixes, kcore address
validation, objdump workarounds. From Adrian Hunter.

* 'trace' beautifiers for lots of syscall arguments, from Arnaldo Carvalho de Melo.

* More compact 'trace' output by suppressing zeroed args, from Arnaldo Carvalho de Melo.

* Show thread COMM by default in 'trace', from Arnaldo Carvalho de Melo.

* Show path associated with fd in live sessions, using a 'vfs_getname'
'perf probe' created dynamic tracepoint or by looking at /proc/pid/fd, from Arnaldo Carvalho de Melo.

* Memory and mmap leak fixes from Chenggang Qin.

* Add option to show full timestamp in 'trace', from David Ahern.

* Add 'record' command in 'trace', to record raw_syscalls:*, from David Ahern.

* Add summary option to dump syscall statistics in 'trace', from David Ahern.

* Fix comm resolution in 'trace' when reading events from file, from David Ahern.

* Improved messages when doing profiling in all or a subset of CPUs
using a workload as the session delimitator, as in:

'perf stat --cpu 0,2 sleep 10s'

from Arnaldo Carvalho de Melo.

* Add units to nanosec-based counters in 'perf stat', from David Ahern.

* Assorted build fixes for from David Ahern and Jiri Olsa.

* 'perf lock' fixes and cleanups, from Davidlohr Bueso.

* Memory leak fixes in 'perf test', from Felipe Pena.

* Build system super speedups, from Ingo Molnar.

* Fix mmap_read event overflow, from Jiri Olsa.

* Code cleanups from Jiri Olsa.

* Allow specifying B/K/M/G unit to the --mmap-pages arguments, from Jiri Olsa.

* Separate the GTK support in a separate libperf-gtk.so DSO, that is
only loaded when --gtk is specified, from Namhyung Kim.

* Fixes for some memory leaks, from Namhyumg Kim.

* Fix srcline sort key behavior, from Namhyung Kim.

* Fix failing assertions in numa bench, from Petr Holasek.

* perf bash completion fixes and improvements from Ramkumar Ramachandra.

* Improve error messages in 'trace', providing hints about system configuration
steps needed for using it, from Ramkumar Ramachandra.

* Remove bogus info when using 'perf stat' -e cycles/instructions, from
Ramkumar Ramachandra.

* Support for Openembedded/Yocto -dbg packages, from Ricardo Ribalda Delgado.

* Implement addr2line directly using libbfd, from Roberto Vitillo.

* Add new option --ignore-vmlinux for perf top, from Willy Tarreau.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

show more ...

tools/perf: Standardize feature support define names to: HAVE_{FEATURE}_SUPPORT

Standardize all the feature flags based on the HAVE_{FEATURE}_SUPPORT naming convention:

HAVE_ARCH_X86_64_SUPPORT

tools/perf: Standardize feature support define names to: HAVE_{FEATURE}_SUPPORT

Standardize all the feature flags based on the HAVE_{FEATURE}_SUPPORT naming convention:

HAVE_ARCH_X86_64_SUPPORT
HAVE_BACKTRACE_SUPPORT
HAVE_CPLUS_DEMANGLE_SUPPORT
HAVE_DWARF_SUPPORT
HAVE_ELF_GETPHDRNUM_SUPPORT
HAVE_GTK2_SUPPORT
HAVE_GTK_INFO_BAR_SUPPORT
HAVE_LIBAUDIT_SUPPORT
HAVE_LIBELF_MMAP_SUPPORT
HAVE_LIBELF_SUPPORT
HAVE_LIBNUMA_SUPPORT
HAVE_LIBUNWIND_SUPPORT
HAVE_ON_EXIT_SUPPORT
HAVE_PERF_REGS_SUPPORT
HAVE_SLANG_SUPPORT
HAVE_STRLCPY_SUPPORT

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-u3zvqejddfZhtrbYbfhi3spa@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

show more ...

Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.

Merge branch 'next' into for-linus

Merge commit 'v2.6.38-rc1' into kbuild/packaging

Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Conflicts:
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next

Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform

Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.

Signed

Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform

Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

show more ...

Merge branch 'linus' into x86/bootmem

Conflicts:
arch/x86/mm/numa_64.c

Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:

e6d2e2b2b1

Merge branch 'linus' into x86/bootmem

Conflicts:
arch/x86/mm/numa_64.c

Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:

e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()

Signed-off-by: Ingo Molnar <mingo@elte.hu>

show more ...

Merge commit 'v2.6.38-rc3' into next

Merge commit 'v2.6.38-rc2' into core/locking

Reason: Update to mainline before adding the locking cleanup

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest

Merge branch 'for-2.6.38' into for-2.6.39

Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus

Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6

Conflicts:
net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>