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.
--
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
pgpBNGIoL6Ql8.pgp
Description: OpenPGP digital
Hi Daniel,
On Wed, 14 Mar 2018 07:56:00 +0100 Daniel Lezcano
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
Hi Daniel,
On Wed, 14 Mar 2018 07:56:00 +0100 Daniel Lezcano
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.
> >
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
pgpMJOgR6ztsr.pgp
Description: OpenPGP digital signature
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
pgpMJOgR6ztsr.pgp
Description: OpenPGP digital signature
Hi Daniel,
On Mon, 10 Jul 2017 12:36:02 +0200 Daniel Lezcano
wrote:
>
> It is fixed now.
Thanks.
--
Cheers,
Stephen Rothwell
Hi Daniel,
On Mon, 10 Jul 2017 12:36:02 +0200 Daniel Lezcano
wrote:
>
> It is fixed now.
Thanks.
--
Cheers,
Stephen Rothwell
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
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
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
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
Hi Daniel,
On Wed, 13 May 2015 09:46:42 +0200 Daniel Lezcano
wrote:
>
> I updated the branch. Let me know if everything is all right now.
Looks good. Thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpX1xYfUxkMS.pgp
Description: OpenPGP digital signature
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
Hi Daniel,
On Wed, 13 May 2015 09:46:42 +0200 Daniel Lezcano daniel.lezc...@linaro.org
wrote:
I updated the branch. Let me know if everything is all right now.
Looks good. Thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpX1xYfUxkMS.pgp
Description: OpenPGP
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
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 Rothwells...@canb.auug.org.au
pgpnviYYoEWcc.pgp
Description: OpenPGP
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 Rothwells...@canb.auug.org.au
pgpnviYYoEWcc.pgp
Description: OpenPGP
18 matches
Mail list logo