[PATCH 06/12] audit: Use timespec64 to represent audit timestamps
arnd at arndb.de
Sat Apr 15 10:29:19 UTC 2017
On Sat, Apr 8, 2017 at 5:58 PM, Deepa Dinamani <deepa.kernel at gmail.com> wrote:
>> I have no problem merging this patch into audit/next for v4.12, would
>> you prefer me to do that so at least this patch is merged?
> This would be fine.
> But, I think whoever takes the last 2 deletion patches should also take them.
> I'm not sure how that part works out.
>> It would probably make life a small bit easier for us in the audit
>> world too as it would reduce the potential merge conflict. However,
>> that's a relatively small thing to worry about.
As Andrew has picked the remaining patches up into -mm, this will work
out fine: any patches picked up by the respective maintainers for v4.12
should arrive as git pull requests before the -mm patches get applied
at a later stage of the merge window.
More information about the samba-technical