Skip to content
Snippets Groups Projects
Select Git revision
  • approxidate-tweaks
  • master default protected
  • bulk-checkin-sign-compare-fix
  • v2.49.0
  • v2.49.0-rc2
  • v2.49.0-rc1
  • v2.49.0-rc0
  • v2.48.1
  • v2.48.0
  • v2.48.0-rc2
  • v2.48.0-rc1
  • v2.46.3
  • v2.40.4
  • v2.41.3
  • v2.42.4
  • v2.43.6
  • v2.44.3
  • v2.45.3
  • v2.47.2
  • v2.48.0-rc0
  • v2.47.1
  • v2.47.0
  • v2.47.0-rc1
23 results

dts-nodes-boolean-prop

  • Stephen Boyd's avatar
    8da56a48
    userdiff: fix some corner cases in dts regex · 8da56a48
    Stephen Boyd authored
    
    While reviewing some dts diffs recently I noticed that the hunk header
    logic was failing to find the containing node. This is because the regex
    doesn't consider properties that may span multiple lines, i.e.
    
    	property = <something>,
    		   <something_else>;
    
    and it got hung up on comments inside nodes that look like the root node
    because they start with '/*'. Add tests for these cases and update the
    regex to find them. Maybe detecting the root node is too complicated but
    forcing it to be a backslash with any amount of whitespace up to an open
    bracket seemed OK. I tried to detect that a comment is in-between the
    two parts but I wasn't happy so I just dropped it.
    
    Cc: Rob Herring <robh+dt@kernel.org>
    Cc: Frank Rowand <frowand.list@gmail.com>
    Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
    Reviewed-by: default avatarJohannes Sixt <j6t@kdbg.org>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    8da56a48
    History
    userdiff: fix some corner cases in dts regex
    Stephen Boyd authored
    
    While reviewing some dts diffs recently I noticed that the hunk header
    logic was failing to find the containing node. This is because the regex
    doesn't consider properties that may span multiple lines, i.e.
    
    	property = <something>,
    		   <something_else>;
    
    and it got hung up on comments inside nodes that look like the root node
    because they start with '/*'. Add tests for these cases and update the
    regex to find them. Maybe detecting the root node is too complicated but
    forcing it to be a backslash with any amount of whitespace up to an open
    bracket seemed OK. I tried to detect that a comment is in-between the
    two parts but I wasn't happy so I just dropped it.
    
    Cc: Rob Herring <robh+dt@kernel.org>
    Cc: Frank Rowand <frowand.list@gmail.com>
    Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
    Reviewed-by: default avatarJohannes Sixt <j6t@kdbg.org>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
Code owners
Assign users and groups as approvers for specific file changes. Learn more.