Skip to contentSkip to conversation

Slight change to merging procedure - master-next

DISCUSSION Richard Purdie 2 participants 3 messages Sep 30, 2011

lore
Share & tools
lore
#0 lore raw

One of the issues I've been having is that I read through patches once doing review and then have to wait ~24 hours before merging any patches I think are acceptable in case others have comments. This means I have to go through emails twice and its a bit of a pain.

I'm therefore going to start maintaining master-next with patches I think are ready. They'll sit there for 24 hours before being merged if there aren't other issues raised by anyone else.

I could just do this in private but I'm choosing to make it public. I want to be clear that branch can rebase and change, its not definite until it hits master. I hope some people find it useful.

Cheers,

Richard

#1 lore raw
Quoted 5 lines · Richard Purdie

One of the issues I've been having is that I read through patches once doing review and then have to wait ~24 hours before merging any patches I think are acceptable in case others have comments. This means I have to go through emails twice and its a bit of a pain.

Quoted 7 lines

I'm therefore going to start maintaining master-next with patches I think are ready. They'll sit there for 24 hours before being merged if there aren't other issues raised by anyone else.

I could just do this in private but I'm choosing to make it public. I want to be clear that branch can rebase and change, its not definite until it hits master. I hope some people find it useful.

I do find it useful, thanks for that.

/me already rebasing remaining changes from xorg patchset on top of master-next ;)

BTW: is there any plan to give some information when something is dropped from master-next? Like: "dropping this from master-next, because of feedback from Joe, please send updated patch"

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 14 lines · Martin Jansa
Quoted 5 lines · Richard Purdie

One of the issues I've been having is that I read through patches once doing review and then have to wait ~24 hours before merging any patches I think are acceptable in case others have comments. This means I have to go through emails twice and its a bit of a pain.

Quoted 7 lines

I'm therefore going to start maintaining master-next with patches I think are ready. They'll sit there for 24 hours before being merged if there aren't other issues raised by anyone else.

I could just do this in private but I'm choosing to make it public. I want to be clear that branch can rebase and change, its not definite until it hits master. I hope some people find it useful.

Quoted 8 lines

I do find it useful, thanks for that.

/me already rebasing remaining changes from xorg patchset on top of master-next ;)

BTW: is there any plan to give some information when something is dropped from master-next? Like: "dropping this from master-next, because of feedback from Joe, please send updated patch"

There would be feedback on the mailing list to a patch indicating it needed something tweaking.

e.g. your comment on the curl update. That one isn't going in until I get to the bottom of the checksum issue.

Cheers,

Richard