feasibility test: tagging into the code


Paoloni, Gabriele <gabriele.paoloni@...>
 

Hi guys

 

As you may remember in the last Safety Arch WG meeting we discussed about possibilities to trace requirements directly into the code.

One of the option was to add tags into the code as single line comment commits and I took the AR to try this out, so I did.

 

I cloned //git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git

Then I did “git checkout v5.4.1 -b my_branch”

Then I added the patches as posted here as attachment

Then I called “git rebase linux-5.4.y” to see what happens when rebasing to newer heads of the stable branch

 

My rebase fails straight forward with the first patch “0001-dummy-tag-1.patch" (that to be honest was quite a simple change)

 

So in summary I am a bit skeptical with respect to this tagging method. BTW I welcome you to play around with the attached

Patches to see if can figure out a smarter way to rebase that I may miss.

 

Thanks

Gab

p.s. conflict shows up as follow:

diff --cc init/main.c

index fef9e610b74b,6b9316a0d239..000000000000

--- a/init/main.c

+++ b/init/main.c

@@@ -1112,7 -1109,7 +1112,11 @@@ static int __ref kernel_init(void *unus

        kernel_init_freeable();

        /* need to finish all async __init code before freeing the memory */

        async_synchronize_full();

++<<<<<<< HEAD

+      kprobe_free_init_mem();

++=======

+ /*tag xyz*/

++>>>>>>> dummy tag 1

        ftrace_free_init_mem();

        free_initmem();

        mark_readonly();

---------------------------------------------------------------------
INTEL CORPORATION ITALIA S.p.A. con unico socio
Sede: Milanofiori Palazzo E 4
CAP 20094 Assago (MI)
Capitale Sociale Euro 104.000,00 interamente versato
Partita I.V.A. e Codice Fiscale  04236760155
Repertorio Economico Amministrativo n. 997124
Registro delle Imprese di Milano nr. 183983/5281/33
Soggetta ad attivita' di direzione e coordinamento di
INTEL CORPORATION, USA

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.