From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: Re: [PATCH lttng-modules] Update .gitignore from
 upstream
Date: Tue, 10 Dec 2019 12:19:32 -0500 (EST)
Message-ID: <1344633017.1658.1575998372268.JavaMail.zimbra__20325.8469978877$1575998390$gmane$org@efficios.com>
References: <20191210164114.26954-1-mjeanson@efficios.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <lttng-dev-bounces@lists.lttng.org>
Received: from mail.efficios.com (mail.efficios.com
 [IPv6:2607:5300:60:7898::beef])
 by lists.lttng.org (Postfix) with ESMTPS id 47XRd15FjDz15Cj
 for <lttng-dev@lists.lttng.org>; Tue, 10 Dec 2019 12:19:33 -0500 (EST)
In-Reply-To: <20191210164114.26954-1-mjeanson@efficios.com>
List-Unsubscribe: <https://lists.lttng.org/cgi-bin/mailman/options/lttng-dev>,
 <mailto:lttng-dev-request@lists.lttng.org?subject=unsubscribe>
List-Archive: <https://lists.lttng.org/pipermail/lttng-dev>
List-Post: <mailto:lttng-dev@lists.lttng.org>
List-Help: <mailto:lttng-dev-request@lists.lttng.org?subject=help>
List-Subscribe: <https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev>,
 <mailto:lttng-dev-request@lists.lttng.org?subject=subscribe>
Errors-To: lttng-dev-bounces@lists.lttng.org
Sender: "lttng-dev" <lttng-dev-bounces@lists.lttng.org>
To: Michael Jeanson <mjeanson@efficios.com>
Cc: lttng-dev <lttng-dev@lists.lttng.org>
List-Id: lttng-dev@lists.lttng.org

All merged into master, stable-2.11, stable-2.10.

Note that for stable-2.10, I had to pick up 2 extra commits for btrfs
so the "constify" patch would apply cleanly:

f059ce66 fix: ext4: Reserve revoke credits for freed blocks (v5.5)
57ff707e fix: btrfs: tracepoints: constify all pointers (v5.5)
065436fd Fix: btrfs: use fs_info for btrfs_handle_em_exist tracepoint
619cabe7 Add btrfs tracepoint for em's EEXIST case
ef77ec63 fix: btrfs block group struct refactor (v5.5)
b06bd5b7 fix: y2038: itimer: change implementation to timespec64 (v5.5)

Thanks,

Mathieu

----- On Dec 10, 2019, at 11:41 AM, Michael Jeanson mjeanson@efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> .gitignore | 110 +++++++++++++++++++++++++++++++++++++++++++----------
> 1 file changed, 89 insertions(+), 21 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 38e1684..4af69a2 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -7,30 +7,45 @@
> # command after changing this file, to see if there are
> # any tracked files which get ignored after the change.
> #
> -# Normal rules
> +# Normal rules (sorted alphabetically)
> #
> .*
> +*.a
> +*.asn1.[ch]
> +*.bin
> +*.bz2
> +*.c.[012]*.*
> +*.dt.yaml
> +*.dtb
> +*.dtb.S
> +*.dwo
> +*.elf
> +*.gcno
> +*.gz
> +*.i
> +*.ko
> +*.lex.c
> +*.ll
> +*.lst
> +*.lz4
> +*.lzma
> +*.lzo
> +*.mod
> +*.mod.c
> *.o
> *.o.*
> -*.a
> +*.patch
> *.s
> -*.ko
> *.so
> *.so.dbg
> -*.mod.c
> -*.i
> -*.lst
> +*.su
> *.symtypes
> -*.order
> +*.tab.[ch]
> +*.tar
> +*.xz
> +Module.symvers
> modules.builtin
> -*.elf
> -*.bin
> -*.gz
> -*.bz2
> -*.lzma
> -*.lzo
> -*.gcno
> -cscope.*
> +modules.order
> 
> #
> # Top-level generic files
> @@ -39,25 +54,51 @@ cscope.*
> /TAGS
> /linux
> /vmlinux
> +/vmlinux.32
> +/vmlinux-gdb.py
> /vmlinuz
> /System.map
> /Module.markers
> +/modules.builtin.modinfo
> +/modules.nsdeps
> 
> -# ignore across tree
> -Module.symvers
> +#
> +# RPM spec file (make rpm-pkg)
> +#
> +/*.spec
> +
> +#
> +# Debian directory (make deb-pkg)
> +#
> +/debian/
> +
> +#
> +# Snap directory (make snap-pkg)
> +#
> +/snap/
> +
> +#
> +# tar directory (make tar*-pkg)
> +#
> +/tar-install/
> 
> #
> -# git files that we don't want to ignore even it they are dot-files
> +# We don't want to ignore the following even if they are dot-files
> #
> +!.clang-format
> +!.cocciconfig
> +!.get_maintainer.ignore
> +!.gitattributes
> !.gitignore
> !.mailmap
> 
> #
> # Generated include files
> #
> -include/config
> -include/linux/version.h
> -include/generated
> +/include/config/
> +/include/generated/
> +/include/ksym/
> +/arch/*/include/generated/
> 
> # stgit generated dirs
> patches-*
> @@ -76,8 +117,35 @@ GRTAGS
> GSYMS
> GTAGS
> 
> +# id-utils files
> +ID
> +
> *.orig
> *~
> \#*#
> 
> +#
> +# Leavings from module signing
> +#
> +extra_certificates
> +signing_key.pem
> +signing_key.priv
> +signing_key.x509
> +x509.genkey
> +
> +# Kconfig presets
> +/all.config
> +/alldef.config
> +/allmod.config
> +/allno.config
> +/allrandom.config
> +/allyes.config
> +
> +# Kdevelop4
> +*.kdev4
> +
> +# Clang's compilation database file
> +/compile_commands.json
> +
> +# lttng-modules specific
> /extra_version
> --
> 2.17.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com