* linux-next: please clean up the clockevents tree @ 2020-02-21 0:37 Stephen Rothwell 2020-02-21 8:32 ` Daniel Lezcano 0 siblings, 1 reply; 13+ messages in thread From: Stephen Rothwell @ 2020-02-21 0:37 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 299 bytes --] Hi Daniel, All the commits in the clockevents tree (git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next) seem to have been applied to other trees as different commits. Please clean it up as it is starting to cause unnecessary conflicts. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2020-02-21 0:37 linux-next: please clean up the clockevents tree Stephen Rothwell @ 2020-02-21 8:32 ` Daniel Lezcano 2020-02-21 11:11 ` Stephen Rothwell 0 siblings, 1 reply; 13+ messages in thread From: Daniel Lezcano @ 2020-02-21 8:32 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1.1: Type: text/plain, Size: 577 bytes --] On 21/02/2020 01:37, Stephen Rothwell wrote: > Hi Daniel, > > All the commits in the clockevents tree > (git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next) > seem to have been applied to other trees as different commits. Please > clean it up as it is starting to cause unnecessary conflicts. Done -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2020-02-21 8:32 ` Daniel Lezcano @ 2020-02-21 11:11 ` Stephen Rothwell 0 siblings, 0 replies; 13+ messages in thread From: Stephen Rothwell @ 2020-02-21 11:11 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 481 bytes --] Hi Daniel, On Fri, 21 Feb 2020 09:32:40 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 21/02/2020 01:37, Stephen Rothwell wrote: > > > > All the commits in the clockevents tree > > (git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next) > > seem to have been applied to other trees as different commits. Please > > clean it up as it is starting to cause unnecessary conflicts. > > Done Thanks. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: please clean up the clockevents tree @ 2018-12-20 5:15 Stephen Rothwell 2018-12-20 8:47 ` Daniel Lezcano 0 siblings, 1 reply; 13+ messages in thread From: Stephen Rothwell @ 2018-12-20 5:15 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 257 bytes --] Hi Daniel, It looks like all the changes in the clockevents tree appear as other commits in other tree(s). Could you please reset your tree to somewhere in your upstream tree as it is beginning to produce conflicts. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2018-12-20 5:15 Stephen Rothwell @ 2018-12-20 8:47 ` Daniel Lezcano 0 siblings, 0 replies; 13+ messages in thread From: Daniel Lezcano @ 2018-12-20 8:47 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List On 20/12/2018 06:15, Stephen Rothwell wrote: > Hi Daniel, > > It looks like all the changes in the clockevents tree appear as other > commits in other tree(s). Could you please reset your tree to somewhere > in your upstream tree as it is beginning to produce conflicts. Done. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog ^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: please clean up the clockevents tree
@ 2018-03-13 23:02 Stephen Rothwell
[not found] ` <ce514c90-f9ec-fc9e-e205-cd822cd766b2@linaro.org>
0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2018-03-13 23:02 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
Hi Daniel,
The clockevents tree appears to only contain an old version of patches
that have been committed upstream. As such, it is only causing conflicts.
Please resync with your upstream tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread[parent not found: <ce514c90-f9ec-fc9e-e205-cd822cd766b2@linaro.org>]
* Re: linux-next: please clean up the clockevents tree [not found] ` <ce514c90-f9ec-fc9e-e205-cd822cd766b2@linaro.org> @ 2018-03-14 8:01 ` Stephen Rothwell 0 siblings, 0 replies; 13+ messages in thread From: Stephen Rothwell @ 2018-03-14 8:01 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 444 bytes --] Hi Daniel, On Wed, 14 Mar 2018 07:56:00 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 14/03/2018 00:02, Stephen Rothwell wrote: > > Hi Daniel, > > > > The clockevents tree appears to only contain an old version of patches > > that have been committed upstream. As such, it is only causing conflicts. > > Please resync with your upstream tree. > > Done. Excellent, thanks. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: please clean up the clockevents tree @ 2017-07-10 3:30 Stephen Rothwell 2017-07-10 10:36 ` Daniel Lezcano 0 siblings, 1 reply; 13+ messages in thread From: Stephen Rothwell @ 2017-07-10 3:30 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List Hi Daniel, Please clean up the clockevents tree (git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next) as all its commits have been merged into other tree(s) as different commits (so all it is doing is adding lots of conflicts :-(). -- Cheers, Stephen Rothwell ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2017-07-10 3:30 Stephen Rothwell @ 2017-07-10 10:36 ` Daniel Lezcano 2017-07-10 10:55 ` Stephen Rothwell 0 siblings, 1 reply; 13+ messages in thread From: Daniel Lezcano @ 2017-07-10 10:36 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List On 10/07/2017 05:30, Stephen Rothwell wrote: > Hi Daniel, > > Please clean up the clockevents tree > (git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next) > as all its commits have been merged into other tree(s) as different > commits (so all it is doing is adding lots of conflicts :-(). Sorry for that. It is fixed now. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2017-07-10 10:36 ` Daniel Lezcano @ 2017-07-10 10:55 ` Stephen Rothwell 0 siblings, 0 replies; 13+ messages in thread From: Stephen Rothwell @ 2017-07-10 10:55 UTC (permalink / raw) To: Daniel Lezcano; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List Hi Daniel, On Mon, 10 Jul 2017 12:36:02 +0200 Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > It is fixed now. Thanks. -- Cheers, Stephen Rothwell ^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: please clean up the clockevents tree @ 2015-05-13 5:19 Stephen Rothwell 2015-05-13 7:46 ` Daniel Lezcano 0 siblings, 1 reply; 13+ messages in thread From: Stephen Rothwell @ 2015-05-13 5:19 UTC (permalink / raw) To: Daniel Lezcano; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 262 bytes --] Hi Daniel, All the commits in the clockevents tree have appeared upstream (as different commits, unfortunately). Please clean up your tree it is just causing unnecessary conflicts. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2015-05-13 5:19 Stephen Rothwell @ 2015-05-13 7:46 ` Daniel Lezcano 2015-05-13 8:26 ` Stephen Rothwell 0 siblings, 1 reply; 13+ messages in thread From: Daniel Lezcano @ 2015-05-13 7:46 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, linux-kernel On 05/13/2015 07:19 AM, Stephen Rothwell wrote: > Hi Daniel, > > All the commits in the clockevents tree have appeared upstream (as > different commits, unfortunately). Please clean up your tree it is > just causing unnecessary conflicts. Hi Stephen, I updated the branch. Let me know if everything is all right now. Thanks. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: please clean up the clockevents tree 2015-05-13 7:46 ` Daniel Lezcano @ 2015-05-13 8:26 ` Stephen Rothwell 0 siblings, 0 replies; 13+ messages in thread From: Stephen Rothwell @ 2015-05-13 8:26 UTC (permalink / raw) To: Daniel Lezcano; +Cc: linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 269 bytes --] Hi Daniel, On Wed, 13 May 2015 09:46:42 +0200 Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > I updated the branch. Let me know if everything is all right now. Looks good. Thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-02-21 11:11 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-21 0:37 linux-next: please clean up the clockevents tree Stephen Rothwell
2020-02-21 8:32 ` Daniel Lezcano
2020-02-21 11:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2018-12-20 5:15 Stephen Rothwell
2018-12-20 8:47 ` Daniel Lezcano
2018-03-13 23:02 Stephen Rothwell
[not found] ` <ce514c90-f9ec-fc9e-e205-cd822cd766b2@linaro.org>
2018-03-14 8:01 ` Stephen Rothwell
2017-07-10 3:30 Stephen Rothwell
2017-07-10 10:36 ` Daniel Lezcano
2017-07-10 10:55 ` Stephen Rothwell
2015-05-13 5:19 Stephen Rothwell
2015-05-13 7:46 ` Daniel Lezcano
2015-05-13 8:26 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).