| Message ID | 20220527103916.52768f74@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the arm-soc tree with Linus' tree | expand |
> Today's linux-next merge of the arm-soc tree got a conflict in: > drivers/clocksource/Makefile > between commit: > c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource") > from Linus' tree and commit: > 5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer") > from the arm-soc tree. > I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. Hi Stephen, Thank you for resolving the merge issue. I am relatively new to this process.. Can you provide a link to where you were notified of the merge conflict? -Nick Hawkins
Hi Nick, On Fri, 27 May 2022 15:38:56 +0000 "Hawkins, Nick" <nick.hawkins@hpe.com> wrote: > > > Today's linux-next merge of the arm-soc tree got a conflict in: > > > > drivers/clocksource/Makefile > > > > between commit: > > > > c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource") > > > > from Linus' tree and commit: > > > > 5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer") > > > > from the arm-soc tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your > > tree is submitted for merging. You may also want to consider > > cooperating with the maintainer of the conflicting tree to minimise > > any particularly complex conflicts. > > Hi Stephen, > > Thank you for resolving the merge issue. I am relatively new to this > process.. Can you provide a link to where you were notified of the > merge conflict? The purpose of linux-next (which is my project) is integration testing, so I spend all day merging the branches that Linus will merge during the merge window. The conflict appeared when I merged the arm-soc tree yesterday.
diff --cc drivers/clocksource/Makefile index 833cfb7a96c1,98017abf6c03..000000000000 --- a/drivers/clocksource/Makefile
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: drivers/clocksource/Makefile between commit: c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource") from Linus' tree and commit: 5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.