Eric Lee / smarc-fsl-linux-kernel

05 Dec, 2019

1 commit

  • a512ae54c   .gitattributes: use 'dts' diff driver for dts files ... Browse Code »

    Git is gaining support to display the closest node to the diff in the
    hunk header via the 'dts' diff driver. Use that driver for all dts and
    dtsi files so we can gain some more context on where the diff is.
    Taking a recent commit in the kernel dts files you can see the
    difference.

    With this patch and an updated git

    : diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : index 62e07e1197cc..4c38426a6969 100644
    : --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : @@ -289,5 +289,29 @@ vdd_hdmi: regulator@1 {
    : gpio = ;
    : enable-active-high;
    : };
    : +
    : + vdd_3v3_pcie: regulator@2 {
    : + compatible = "regulator-fixed";

    vs. without this patch

    : diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : index 62e07e1197cc..4c38426a6969 100644
    : --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
    : @@ -289,5 +289,29 @@
    : gpio = ;
    : enable-active-high;
    : };
    : +
    : + vdd_3v3_pcie: regulator@2 {
    : + compatible = "regulator-fixed";

    You can see that we don't know what the context node is because it isn't
    shown after the '@@'.

    dts is not released yet but it is staged to be in the next release[1].
    One can probably build git from source and try it out.

    [1] https://git.kernel.org/pub/scm/git/git.git/commit/?id=d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1

    Link: http://lkml.kernel.org/r/20191004212311.141538-1-swboyd@chromium.org
    Signed-off-by: Stephen Boyd
    Cc: Rob Herring
    Cc: Randy Dunlap
    Acked-by: Frank Rowand
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Boyd
     

08 Oct, 2016

1 commit

  • 218dd8588   .gitattributes: set git diff driver for C source code files ... Browse Code »

    Git can be told to apply language-specific rules when generating diffs.
    Enable this for C source code files (*.c and *.h) so that function names
    are printed right. Specifically, doing so prevents "git diff" from
    mistakenly considering unindented goto labels as function names.

    Link: http://lkml.kernel.org/r/20160907143403.1449324f@endymion
    Signed-off-by: Jean Delvare
    Cc: Peter Zijlstra
    Cc: Joe Perches
    Cc: Jonathan Corbet
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare