WTF? This has +2 and +1 from Jenkins, and no "merge conflict". Yet when I click on 'submit', Gerrit says:

'Code Review - Error change is new [continue]'

Also, the two following commits from the same branch were not merge conflicted yesterday after I submitted them. Today they are marked as conflict.

This nonsense is really getting on my case. These commits are really trivial, yet Gerrit can't get its shit together. This is ONE LETTER! <steam> I hate it when simple tasks get overcomplicated by automation (that fails).

I'm tempted to merge to master manually, but I should rather calm down and we should resolve the underlying problems, or we'll face this over and over again. I'm going to merge over 100 Iu branch commits like this, so it's worth it.

I tried to search online for answers but so far I'm completely stumped. Any ideas?

For now I tried to hit the 'rebase' button. Of course now I have to wait for another jenkins +1. Not sure how to handle this -- if I just +1 manually and submit, I may introduce errors. If I don't, this might race indefinitely, while other changes get merged to master I have to repeatedly rebase and wait for jenkins, and my change may never merge, however simple it is.

Also, every single patch sitting in the queue has to be rebased all the time, apparently. Really?

Again, any ideas?

~Neels

On Tue, May 31, 2016 at 11:53:26AM +0000, Neels Hofmeyr wrote:

Review at https://gerrit.osmocom.org/157

rename enum gprs_mm_state to gprs_gmm_state

Change-Id: Ibba054d15c55c7ac570e64ff66ea57964be095e3

M openbsc/include/openbsc/gprs_sgsn.h 1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/57/157/1

diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index 898b7a5..5fbbf28 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -23,7 +23,7 @@ enum gsm48_gsm_cause;

/* TS 04.08 4.1.3.3 GMM mobility management states on the network side */ -enum gprs_mm_state { +enum gprs_gmm_state { GMM_DEREGISTERED, /* 4.1.3.3.1.1 */ GMM_COMMON_PROC_INIT, /* 4.1.3.3.1.2 */ GMM_REGISTERED_NORMAL, /* 4.1.3.3.2.1 */ @@ -98,7 +98,7 @@ struct llist_head list;

char imsi[GSM23003_IMSI_MAX_DIGITS+1];

• enum gprs_mm_state mm_state;

• enum gprs_gmm_state mm_state; uint32_t p_tmsi; uint32_t p_tmsi_old; /* old P-TMSI before new is confirmed */ uint32_t p_tmsi_sig;

-- To view, visit https://gerrit.osmocom.org/157 To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange Gerrit-Change-Id: Ibba054d15c55c7ac570e64ff66ea57964be095e3 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr nhofmeyr@sysmocom.de Gerrit-Reviewer: daniel dwillmann@sysmocom.de