Changes in check-perf-trace-record

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

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

Wed, 09 Mar 2011 16:15:44 +0100

Merge commit 'v2.6.38-rc1' into kbuild/packaging List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 07:06:28 +0100

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

b74b953b998bcc2db91b694446f3a2619ec32de6 - Merge commit 'v2.6.36' into kbuild/misc

Thu, 28 Oct 2010 00:15:57 +0200

Merge commit 'v2.6.36' into kbuild/miscUpdate to be able to fix a recent change to scripts/basic/docproc.c(commit eda603f). List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 - Merge branches 'gemini' and 'misc' into devel

Fri, 06 Aug 2010 19:13:54 +0200

Merge branches 'gemini' and 'misc' into devel List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

7a996d3ab150bb0e1b71fa182f70199a703efdd1 - Merge commit 'v2.6.35' into kbuild/kconfig

Wed, 04 Aug 2010 14:05:07 +0200

Merge commit 'v2.6.35' into kbuild/kconfigConflicts: scripts/kconfig/Makefile List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

772320e84588dcbe1600ffb83e5f328f2209ac2a - Merge commit 'v2.6.35' into kbuild/kbuild

Wed, 04 Aug 2010 13:59:13 +0200

Merge commit 'v2.6.35' into kbuild/kbuildConflicts: arch/powerpc/Makefile List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

d8a382d2662822248a97ce9d670b90e68aefbd3a - Merge remote branch 'tip/perf/urgent' into oprofile/urgent

Fri, 04 Jun 2010 11:33:10 +0200

Merge remote branch 'tip/perf/urgent' into oprofile/urgent List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 - Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release

Wed, 02 Jun 2010 04:53:36 +0200

Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

1d61e73ab4c7470833241af888939a7aab2b0354 - Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35

Tue, 01 Jun 2010 09:57:49 +0200

Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35 List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

e37c83c06c2690157a989df40dc99a6b61c9ea15 - Merge commit 'v2.6.35-rc1' into for-2.6.36

Mon, 31 May 2010 12:07:15 +0200

Merge commit 'v2.6.35-rc1' into for-2.6.36 List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

50d1e9302bab7d35dae7146f8c468e0943015616 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6

Wed, 26 May 2010 03:36:58 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6 List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

b1e50ebcf24668e57f058deb48b0704b5391ed0f - Merge remote branch 'origin' into secretlab/next-spi

Tue, 25 May 2010 08:38:26 +0200

Merge remote branch 'origin' into secretlab/next-spi List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

cf9b59e9d3e008591d1f54830f570982bb307a0d - Merge remote branch 'origin' into secretlab/next-devicetree

Sat, 22 May 2010 08:36:56 +0200

Merge remote branch 'origin' into secretlab/next-devicetreeMerging in current state of Linus' tree to deal with merge conflicts andbuild failures in vio.c after merge.Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.cAlso fixed up one line in arch/powerpc/kernel/vio.c to use thecorrect node pointer.Signed-off-by: Grant Likely List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

19fdb9eefb21b72edbc365b838502780c392bad6 - Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Sat, 22 May 2010 00:31:36 +0200

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linusConflicts: drivers/md/md.c- Resolved conflict in md_update_sb- Added extra 'NULL' arg to new instance of sysfs_get_dirent.Signed-off-by: NeilBrown List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

ee9a3607fb03e804ddf624544105f4e34260c380 - Merge branch 'master' into for-2.6.35

Fri, 21 May 2010 21:27:26 +0200

Merge branch 'master' into for-2.6.35Conflicts: fs/ext3/fsync.cSigned-off-by: Jens Axboe List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 - Merge branch 'omap4-i2c-init' into omap-for-linus

Thu, 20 May 2010 20:37:23 +0200

Merge branch 'omap4-i2c-init' into omap-for-linus List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

ffee72d4681c8777918268a96aef42bdeb6c367b - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Thu, 20 May 2010 04:57:38 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 - Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Wed, 19 May 2010 08:01:55 +0200

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record

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

Tue, 18 May 2010 17:19:03 +0200

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (311 commits) perf tools: Add mode to build without newt support perf symbols: symbol inconsistency message should be done only at verbose=1 perf tui: Add explicit -lslang option perf options: Type check all the remaining OPT_ variants perf options: Type check OPT_BOOLEAN and fix the offenders perf options: Check v type in OPT_U?INTEGER perf options: Introduce OPT_UINTEGER perf tui: Add workaround for slang < 2.1.4 perf record: Fix bug mismatch with -c option definition perf options: Introduce OPT_U64 perf tui: Add help window to show key associations perf tui: Make <- exit menus too perf newt: Add single key shortcuts for zoom into DSO and threads perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed perf newt: Fix the 'A'/'a' shortcut for annotate perf newt: Make <- exit the ui_browser x86, perf: P4 PMU - fix counters management logic perf newt: Make <- zoom out filters perf report: Report number of events, not samples perf hist: Clarify events_stats fields usage ...Fix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c List of files: /linux/tools/perf/scripts/perl/bin/check-perf-trace-record