linux-next: manual merge of the vfs tree with the tree

2015-06-04 Thread m...@ellerman.id.au
Hi Al, Today's linux-next merge of the vfs tree got a conflict in fs/namei.c between commit 890458a43dbd ("path: New helpers path_get_pin/path_put_unpin for path pin") from the nfsd tree and commit 894bc8c4662b ("namei: remove restrictions on nesting depth") from the vfs tree. I fixed it up (see

RE: [V3 01/10] perf: New conditional branch filter criteria in branch stack sampling

2013-11-25 Thread m...@ellerman.id.au
Ideally your commit subject would contain a verb, preferably in the present tense. I think simply "perf: Add PERF_SAMPLE_BRANCH_COND" would be clearer. On Wed, 2013-16-10 at 06:56:48 UTC, Anshuman Khandual wrote: > POWER8 PMU based BHRB supports filtering for conditional branches. > This patch in

RE: [V3 02/10] powerpc, perf: Enable conditional branch filter for POWER8

2013-11-25 Thread m...@ellerman.id.au
On Wed, 2013-16-10 at 06:56:49 UTC, Anshuman Khandual wrote: > Enables conditional branch filter support for POWER8 > utilizing MMCRA register based filter and also invalidates > a BHRB branch filter combination involving conditional > branches. > > Signed-off-by: Anshuman Khandual > --- > arch/