Changes in net_dropmonitor-report

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/python/bin/net_dropmonitor-report

da733563be5a9da26fe81d9f007262d00b846e22 - Merge branch 'next' into for-linus

Mon, 09 Jan 2012 08:38:23 +0100

Merge branch 'next' into for-linus List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

251f39fe42dae863bd24e30864e6b66076ba076d - Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

Wed, 04 Jan 2012 06:09:35 +0100

Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

e4da3fbfbd1de56d2367653e3823e6445e49f8a9 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next

Thu, 01 Dec 2011 11:14:48 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 - Merge commit 'v3.2-rc3' into next

Tue, 29 Nov 2011 10:51:07 +0100

Merge commit 'v3.2-rc3' into next List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

d4bbf7e7759afc172e2bfbc5c416324590049cdd - Merge branch 'master' into x86/memblock

Mon, 28 Nov 2011 18:46:22 +0100

Merge branch 'master' into x86/memblockConflicts & resolutions:* arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().* drivers/pci/intel-iommu.c 166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.* mm/Kconfig 6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.* mm/memblock.c d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial.Signed-off-by: Tejun Heo List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

300e812db26f4aa022e346f5fb9af1af134d98d8 - Merge commit 'v3.2-rc2' into fbdev-next

Tue, 22 Nov 2011 00:42:06 +0100

Merge commit 'v3.2-rc2' into fbdev-next List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

24942c8e5cc8696064ee207ff29d4cf21f70dafc - Merge branch 'master'; commit 'v3.2-rc2' into next

Wed, 16 Nov 2011 02:39:48 +0100

Merge branch 'master'; commit 'v3.2-rc2' into next List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 - Merge branch 'master' into for-next

Sun, 13 Nov 2011 20:55:35 +0100

Merge branch 'master' into for-nextSync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driverin the config and Makefile") as I have patch depending on that one. List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

5e819059a20b0fc5a71875f28b4cae359e38d85a - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Wed, 09 Nov 2011 20:49:23 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

de346b6949063aa040ef607943b072835294f4b3 - Merge branch 'perf/core' into oprofile/master

Tue, 08 Nov 2011 15:52:15 +0100

Merge branch 'perf/core' into oprofile/masterMerge reason: Resolve conflicts with Don's NMI rework: commit 9c48f1c629ecfa114850c03f875c6691003214de Author: Don Zickus Date: Fri Sep 30 15:06:21 2011 -0400 x86, nmi: Wire up NMI handlers to new routinesConflicts: arch/x86/oprofile/nmi_timer_int.cSigned-off-by: Robert Richter List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

41966710ab574f1fcedf3e10e1ceef911c096d1d - Merge branch 'for-3.2' into for-3.3

Tue, 08 Nov 2011 11:47:46 +0100

Merge branch 'for-3.2' into for-3.3 List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

d63638440cfad75fb339fd1261bea0485c7c3ecc - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Fri, 04 Nov 2011 15:15:29 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

31cbecb4ab538f433145bc5a46f3bea9b9627031 - Merge branch 'osd-devel' into nfs-for-next

Thu, 03 Nov 2011 04:56:40 +0100

Merge branch 'osd-devel' into nfs-for-next List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

Fri, 28 Oct 2011 07:16:43 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

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

Wed, 26 Oct 2011 17:03:38 +0200

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits) perf symbols: Increase symbol KSYM_NAME_LEN size perf hists browser: Refuse 'a' hotkey on non symbolic views perf ui browser: Use libslang to read keys perf tools: Fix tracing info recording perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads perf hists: Don't consider filtered entries when calculating column widths perf hists: Don't decay total_period for filtered entries perf hists browser: Honour symbol_conf.show_{nr_samples,total_period} perf hists browser: Do not exit on tab key with single event perf annotate browser: Don't change selection line when returning from callq perf tools: handle endianness of feature bitmap perf tools: Add prelink suggestion to dso update message perf script: Fix unknown feature comment perf hists browser: Apply the dso and thread filters when merging new batches perf hists: Move the dso and thread filters from hist_browser perf ui browser: Honour the xterm colors perf top tui: Give color hints just on the percentage, like on --stdio perf ui browser: Make the colors configurable and change the defaults perf tui: Remove unneeded call to newtCls on startup perf hists: Don't format the percentage on hist_entry__snprintf ...Fix up conflicts in arch/x86/kernel/kprobes.c manually.Ingo's tree did the insane "add volatile to const array", which justdoesn't make sense ("volatile const"?). But we could remove the const*and* make the array volatile to make doubly sure that gcc doesn'toptimize it away..Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: thereader_lock has been turned into a raw lock by the core locking merge,and there was a new user of it introduced in this perf core merge. Makesure that new use also uses the raw accessor functions. List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report

63e03724b51e7315a66a3f1fee6cb8b4a16dc8cc - perf script: Add drop monitor script

Mon, 04 Jul 2011 19:40:17 +0200

perf script: Add drop monitor scriptA while back I created the dropmonitor protocol, which allowed users to getreports of dropped frames communicated to them via a netlink socket.While useful, several people have now asked that I integrate the abilityto do drop monitoring with perf, so they don't have to run additionaltools.This patch adds a drop monitor script to the perf suite, and providesthe same output that the netlink socket does.Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1309801217-22450-1-git-send-email-nhorman@tuxdriver.comSigned-off-by: Neil Horman Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/tools/perf/scripts/python/bin/net_dropmonitor-report