Skip to content

Wise 1510: fix a silent conflict with PR #5947 #5982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2018
Merged

Wise 1510: fix a silent conflict with PR #5947 #5982

merged 1 commit into from
Jan 31, 2018

Conversation

ithinuel
Copy link
Member

Description

PR #5947 requires some additional defines.
This PR completes #5904 and fixes the latent "conflict".

Status

READY

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 31, 2018

/morph build

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 31, 2018

It's missing in the commit message how is this fixing it (what is actually in this PR, what I can guess from the actual changes, mbed added defines for this target were missing?)

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 31, 2018

If this fixes the error, then #5977 can be closed. As soon as this gets green, will get in and the other closed

@mbed-ci
Copy link

mbed-ci commented Jan 31, 2018

Build : SUCCESS

Build number : 1018
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/5982/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 31, 2018

I can confirm this fixes the bug ! 👍

@mbed-ci
Copy link

mbed-ci commented Jan 31, 2018

@orenc17
Copy link
Contributor

orenc17 commented Jan 31, 2018

/morph uvisor-test

@mbed-ci
Copy link

mbed-ci commented Jan 31, 2018

@0xc0170 0xc0170 merged commit 195b3ea into ARMmbed:master Jan 31, 2018
@0xc0170 0xc0170 changed the title fixes a silent conflict with PR #5947 Wise 1510: fix a silent conflict with PR #5947 Jan 31, 2018
@mbed-ci
Copy link

mbed-ci commented Jan 31, 2018

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 31, 2018

I've just noticed the last run, that is default target, looks like an error (the previous run is actually valid, and looks all being tested)

@ithinuel ithinuel deleted the add-wise-1510 branch January 31, 2018 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants