Re: [PATCH RFC] hist lookups

[Jiri Olsa]

On Sun, Nov 11, 2018 at 02:32:08PM -0800, David Miller wrote:
> From: Jiri Olsa <jolsa@xxxxxxxxxx>
> Date: Sun, 11 Nov 2018 20:41:32 +0100
> 
> > I added the dropping logic, it's simple so far..
> 
> How do you maintain your perf/fixes branch?  Do you rebase? :-/
> 
> I just pulled after a previous pull and got nothing but conflicts on
> every single file.

yep, I rebase.. it's my devel branch, I dont keep it sane, sry ;-)

jirka