Skip to content

Add poll API #112

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 11, 2016
Merged

Add poll API #112

merged 1 commit into from
Jan 11, 2016

Conversation

diwic
Copy link
Contributor

@diwic diwic commented Dec 25, 2015

You seem to have a very ambitious CI system here, so I'm just going to throw my code at that and see if it builds :-)

@steveklabnik
Copy link
Member

This will need a rebase, at least.

@diwic
Copy link
Contributor Author

diwic commented Dec 25, 2015

@steveklabnik, thanks - rebase on top of what? Or do you mean I should squash the "Add Poll API" and "Fix poll API" commits?

Signed-off-by: David Henningsson <diwic@ubuntu.com>
@diwic
Copy link
Contributor Author

diwic commented Dec 25, 2015

Ok, I squashed them now. The only failing build is mips (unless I failed to squash them correctly!) and, from what I can understand, it seems unrelated to my poll API addition, so I suppose this can be merged?

@steveklabnik
Copy link
Member

2015-12-25-194742_140x120_scrot

this icon to me says 'rebase', but github has been messing with their UI lately, so maybe it's because of the failing CI.

@diwic
Copy link
Contributor Author

diwic commented Dec 26, 2015

Mips build fails with the following error:

error: linking with `mips-linux-gnu-gcc` failed: exit code: 1
/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: Dwarf Error: found dwarf version '4', this reader only handles version 2 and 3 information.
/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: Dwarf Error: found dwarf version '0', this reader only handles version 2 and 3 information.
/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: Dwarf Error: found dwarf version '0', this reader only handles version 2 and 3 information.
/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: Dwarf Error: found dwarf version '3072', this reader only handles version 2 and 3 information.
error: aborting due to previous error

This is the only failed build and it does not seem related to the addition of the poll API, unless I'm missing something?

@diwic
Copy link
Contributor Author

diwic commented Dec 26, 2015

Should be okay rebase wise - I forked this yesterday, and the last commit is a few days old.

@alexcrichton
Copy link
Member

Thanks @diwic! The mips failures look unrelated, so I'll work on getting this merged with a few others as well.

@alexcrichton alexcrichton merged commit 9d2493e into rust-lang:master Jan 11, 2016
@alexcrichton
Copy link
Member

To link things up, landed in #134

@diwic
Copy link
Contributor Author

diwic commented Jan 12, 2016

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants