History log of /linux/tools/scripts/Makefile.include (Results 476 – 500 of 583)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v3.13-rc6, v3.13-rc5
# bdebbacd 19-Dec-2013 Jiri Olsa <jolsa@redhat.com>

tools lib traceevent: Add global QUIET_CC_FPIC build output

Adding global QUIET_CC_FPIC build output variable and getting rid of
local print_fpic_compile and print_plugin_obj_compile.

Signed-off-by

tools lib traceevent: Add global QUIET_CC_FPIC build output

Adding global QUIET_CC_FPIC build output variable and getting rid of
local print_fpic_compile and print_plugin_obj_compile.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1387460527-15030-6-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

show more ...


# b7248def 19-Dec-2013 Jiri Olsa <jolsa@redhat.com>

perf tools: Making QUIET_(CLEAN|INSTAL) variables global

Moving QUIET_(CLEAN|INSTAL) variables into:

tools/scripts/Makefile.include

to be usable by other tools. The change to use them in libtrac

perf tools: Making QUIET_(CLEAN|INSTAL) variables global

Moving QUIET_(CLEAN|INSTAL) variables into:

tools/scripts/Makefile.include

to be usable by other tools. The change to use them in libtraceevent is
in following patches.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1387460527-15030-3-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

show more ...


# e23c34bb 19-Dec-2013 Jiri Kosina <jkosina@suse.cz>

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>


# c4de673b 16-Dec-2013 Johannes Berg <johannes.berg@intel.com>

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


# 348324c5 16-Dec-2013 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge tag 'v3.13-rc4' into next

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


Revision tags: v3.13-rc4
# 5d43889c 10-Dec-2013 Dmitry Torokhov <dmitry.torokhov@gmail.com>

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

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


# f7698ba7 09-Dec-2013 Daniel Vetter <daniel.vetter@ffwll.ch>

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 ...


Revision tags: v3.13-rc3, v3.13-rc2
# f19f8d8e 26-Nov-2013 Tony Lindgren <tony@atomide.com>

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


# 258d2fbf 25-Nov-2013 Mauro Carvalho Chehab <m.chehab@samsung.com>

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 ...


# 30c27abd 24-Nov-2013 Mark Brown <broonie@linaro.org>

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

Linux 3.13-rc1


Revision tags: v3.13-rc1
# 6886059f 16-Nov-2013 Olof Johansson <olof@lixom.net>

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 ...


# 42249094 15-Nov-2013 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.


# ad5d6989 12-Nov-2013 Linus Torvalds <torvalds@linux-foundation.org>

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 ...


Revision tags: v3.12, v3.12-rc7, v3.12-rc6
# 1ff9ecf7 15-Oct-2013 Ingo Molnar <mingo@kernel.org>

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 ...


Revision tags: v3.12-rc5
# 65fb0992 09-Oct-2013 Ingo Molnar <mingo@kernel.org>

tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk

The various build lines from libtraceevent and perf mix up during a
parallel build and produce unaligned output like:

tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk

The various build lines from libtraceevent and perf mix up during a
parallel build and produce unaligned output like:

CC builtin-buildid-list.o
CC builtin-buildid-cache.o
CC builtin-list.o
CC FPIC trace-seq.o
CC builtin-record.o
CC FPIC parse-filter.o
CC builtin-report.o
CC builtin-stat.o
CC FPIC parse-utils.o
CC FPIC kbuffer-parse.o
CC builtin-timechart.o
CC builtin-top.o
CC builtin-script.o
BUILD STATIC LIB libtraceevent.a
CC builtin-probe.o
CC builtin-kmem.o
CC builtin-lock.o

To solve this, harmonize all the build message alignments to be similar
to the kernel's kbuild output: prefixed by two spaces and 11-char wide.

After the patch the output looks pretty tidy, even if output lines get
mixed up:

CC builtin-annotate.o
FLAGS: * new build flags or cross compiler
CC builtin-bench.o
AR liblk.a
CC bench/sched-messaging.o
CC FPIC event-parse.o
CC bench/sched-pipe.o
CC FPIC trace-seq.o
CC bench/mem-memcpy.o
CC bench/mem-memset.o
CC FPIC parse-filter.o
CC builtin-diff.o
CC builtin-evlist.o
CC builtin-help.o

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

show more ...


# 8ec19c0e 09-Oct-2013 Ingo Molnar <mingo@kernel.org>

perf tools: Implement summary output for 'make clean'

'make clean' used to show all the rm lines, which isn't really
informative in any way and spams the console.

Implement summary output:

comet

perf tools: Implement summary output for 'make clean'

'make clean' used to show all the rm lines, which isn't really
informative in any way and spams the console.

Implement summary output:

comet:~/tip/tools/perf> make clean
CLEAN libtraceevent
CLEAN liblk
CLEAN config
CLEAN core-objs
CLEAN core-progs
CLEAN core-gen
CLEAN Documentation
CLEAN python

'make clean V=1' will still show the old, detailed output.

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

show more ...


Revision tags: v3.12-rc4, v3.12-rc3, v3.12-rc2
# 4ba25a49 18-Sep-2013 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.


Revision tags: v3.12-rc1
# eeca9fad 07-Sep-2013 Herbert Xu <herbert@gondor.apana.org.au>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.


# efd15f5f 04-Sep-2013 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosi

Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

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

show more ...


Revision tags: v3.11
# bf550fc9 29-Aug-2013 Alexander Graf <agraf@suse.de>

Merge remote-tracking branch 'origin/next' into kvm-ppc-next

Conflicts:
mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.


Revision tags: v3.11-rc7, v3.11-rc6
# ee3e542f 15-Aug-2013 Sage Weil <sage@inktank.com>

Merge remote-tracking branch 'linus/master' into testing


Revision tags: v3.11-rc5, v3.11-rc4, v3.11-rc3
# cb54b53a 25-Jul-2013 Daniel Vetter <daniel.vetter@ffwll.ch>

Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'

This backmerges Linus' merge commit of the latest drm-fixes pull:

commit 549f3a1218ba18fcde11ef0e22b07e6365645

Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'

This backmerges Linus' merge commit of the latest drm-fixes pull:

commit 549f3a1218ba18fcde11ef0e22b07e6365645788
Merge: 42577ca 058ca4a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue Jul 23 15:47:08 2013 -0700

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

We've accrued a few too many conflicts, but the real reason is that I
want to merge the 100% solution for Haswell concurrent registers
writes into drm-intel-next. But that depends upon the 90% bandaid
merged into -fixes:

commit a7cd1b8fea2f341b626b255d9898a5ca5fabbf0a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 19 20:36:51 2013 +0100

drm/i915: Serialize almost all register access

Also, we can roll up on accrued conflicts.

Usually I'd backmerge a tagged -rc, but I want to get this done before
heading off to vacations next week ;-)

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c

v2: For added hilarity we have a init sequence conflict around the
gt_lock, so need to move that one, too. Spotted by Jani Nikula.

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

show more ...


# a3f86127 25-Jul-2013 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Sync with Linus' master to be able to apply
trivial patche to newer code.

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


# b59f2b4d 23-Jul-2013 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.11-rc2' into core/locking

Merge in Linux 3.11-rc2 before moving on with new work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# b24d6f49 22-Jul-2013 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.11-rc2' into sched/core

Merge in Linux 3.11-rc2, to provide a post-merge-window development base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


1...<<11121314151617181920>>...24