Skip to content

Conversation

jameshilliard
Copy link

This should hopefully fix the pool diff problem on S4.

@xjl2000
Copy link

xjl2000 commented Nov 10, 2014

we had dealt the pool diff on S4.Is there any questinos?

@jameshilliard
Copy link
Author

Your fix appears to have worked, is it intended to merge this branch with mainline cgminer at any point?

@xjl2000
Copy link

xjl2000 commented Nov 20, 2014

So far my fix work well,and had merge the branch manually

@jameshilliard
Copy link
Author

Yes, there are still advantages to having a driver in mainline however, ckolivas and kano help maintain those drivers and can often spot and fix issues like this quickly in addition for USB miners they provide builds for many different platforms. They did already merge the S1 and S2 driver here https://github.com/ckolivas/cgminer/blob/master/driver-bitmain.c . I think it would be more efficient for everyone to work on the same fork rather than there being two incompatible forks that are maintained completely independently.

@xjl2000
Copy link

xjl2000 commented Nov 24, 2014

Yes,I agree ,however we merged the S1/S2/S3/S4 driver herehttps://github.com/bitmaintech/cgminer/blob/master/driver-bitmain.h.

@jameshilliard
Copy link
Author

Right now the Bitmain fork has diverged significantly from mainline cgminer and can't be merged with mainline in its current state "This branch is 96 commits ahead, 2480 commits behind ckolivas:master". To merge the changes to mainline you should clone mainline separately and commit just the diffs needed to add the S3 and S4 driver compatibility in addition to any other drivers that you want merged(mainline does already supports S1 and S2). Then you would be able to submit a pull request for those changes to mainline so that they can be integrated(ckolivas and/or kano will then usually review the changes and make suggestions for improvements/styling before merging them to mainline).

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