diff mbox series

mailmap: add entries for Serge Hallyn's dead accounts

Message ID 20231113192125.57117-2-paul@paul-moore.com (mailing list archive)
State Accepted
Delegated to: Paul Moore
Headers show
Series mailmap: add entries for Serge Hallyn's dead accounts | expand

Commit Message

Paul Moore Nov. 13, 2023, 7:21 p.m. UTC 
From: Serge Hallyn <serge@hallyn.com>

Signed-off-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul Moore Nov. 13, 2023, 7:23 p.m. UTC | #1 
On Mon, Nov 13, 2023 at 2:21 PM Paul Moore <paul@paul-moore.com> wrote:
>
> From: Serge Hallyn <serge@hallyn.com>
>
> Signed-off-by: Serge Hallyn <serge@hallyn.com>
> Signed-off-by: Paul Moore <paul@paul-moore.com>
> ---
>  .mailmap | 2 ++
>  1 file changed, 2 insertions(+)

Merged into lsm/dev.

> diff --git a/.mailmap b/.mailmap
> index 2ba581ebb2cf..35086f4a7961 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -535,6 +535,8 @@ Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
>  Sebastian Reichel <sre@kernel.org> <sre@debian.org>
>  Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
>  Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
> +Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
> +Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
>  Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
>  Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
>  Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
> --
> 2.42.1
Serge E. Hallyn Nov. 13, 2023, 10:57 p.m. UTC | #2 
On Mon, Nov 13, 2023 at 02:23:08PM -0500, Paul Moore wrote:
> On Mon, Nov 13, 2023 at 2:21 PM Paul Moore <paul@paul-moore.com> wrote:
> >
> > From: Serge Hallyn <serge@hallyn.com>
> >
> > Signed-off-by: Serge Hallyn <serge@hallyn.com>
> > Signed-off-by: Paul Moore <paul@paul-moore.com>
> > ---
> >  .mailmap | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> Merged into lsm/dev.

Thank you

> 
> > diff --git a/.mailmap b/.mailmap
> > index 2ba581ebb2cf..35086f4a7961 100644
> > --- a/.mailmap
> > +++ b/.mailmap
> > @@ -535,6 +535,8 @@ Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
> >  Sebastian Reichel <sre@kernel.org> <sre@debian.org>
> >  Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
> >  Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
> > +Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
> > +Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
> >  Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
> >  Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
> >  Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
> > --
> > 2.42.1
> 
> -- 
> paul-moore.com
diff mbox series

Patch

diff --git a/.mailmap b/.mailmap
index 2ba581ebb2cf..35086f4a7961 100644
--- a/.mailmap
+++ b/.mailmap
@@ -535,6 +535,8 @@  Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
 Sebastian Reichel <sre@kernel.org> <sre@debian.org>
 Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
 Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
+Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
+Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
 Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
 Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
 Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>