Re: [PATCH 1/2] Revert "In auditctl, when resetting lost request status output afterwards"

[Steve Grubb <sgrubb@redhat.com>]

On Monday, November 27, 2017 5:41:32 PM EST Richard Guy Briggs wrote:
> On 2017-11-27 17:16, Steve Grubb wrote:
> > On Wednesday, November 22, 2017 7:00:56 PM EST Richard Guy Briggs wrote:
> > > This reverts commit 56a708761347ba49ccdc2378d31133f01129f4f2.
> > > 
> > > Conflicts:
> > > ChangeLog
> > > ---
> > > ChangeLog      | 1 +
> > > src/auditctl.c | 7 ++++---
> > > 2 files changed, 5 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/ChangeLog b/ChangeLog
> > > index de9ae56..4e9ca3d 100644
> > > --- a/ChangeLog
> > > +++ b/ChangeLog
> > > @@ -4,6 +4,7 @@
> > > - In auditctl, when resetting lost request status output afterwards
> > > - AVC report from aureport was missing result column header (#1511606)
> > > - Add SOFTWARE_UPDATE event
> > > +- REVERT: In auditctl, when resetting lost request status output
> > > afterwards> 
> > Applied. But its best not to mess with the Changelog because there is no
> > guarantee this patch goes in before other work.  As it turns out, it
> > failed to apply and then I deleted this chunk and everything was OK.
> 
> Ok, so I should have just added a Changelog entry to quote the previous
> one, reverting it?

No. Just don't modify the changelog file. It can cause things not to apply 
because other things went in first. I'll keep the Changelog file updated 
separate to any patches submitted.

-Steve