| *** tpollard has joined #cip | 03:14 | |
| *** tpollard has quit IRC | 03:18 | |
| iwamatsu | szlin: | 03:33 |
|---|---|---|
| iwamatsu | We only supported 4.4, but now we manage two. | 03:33 |
| iwamatsu | I think that the master branch doesn't make much sense to us. | 03:33 |
| iwamatsu | We only supported 4.4, but now we manage two. | 03:33 |
| iwamatsu | I think that the master branch doesn't make much sense to us. | 03:33 |
| iwamatsu | hm | 03:33 |
| iwamatsu | szlin: I suggest pushing the HEAD of the 4.4 or 4.19 CIP kernel to the master branch | 03:34 |
| iwamatsu | or pushing Linus's master. | 03:34 |
| iwamatsu | szlin: BTW, I dont have permisson for create new page of cip's Wiki. Who should I contact about this? | 03:36 |
| *** rajm has joined #cip | 07:24 | |
| szlin | iwamatsu: please send the request to Neal. | 07:42 |
| iwamatsu | szlin: I see. thank you. | 07:43 |
| szlin | iwamatsu: got it, thanks. | 07:43 |
| szlin | bwh: do you have any comments on Iwamatsu's proposal? "pushing the HEAD of the 4.4 or 4.19 CIP kernel to the master branch" or "pushing Linus's master" | 07:46 |
| szlin | wagi: ^ :-) | 07:46 |
| wagi | Good morning. On which tree is our tree based? | 07:47 |
| wagi | Isn't it the stable tree? | 07:47 |
| wagi | Just a checked what gregkh is doing | 07:49 |
| wagi | The master of the stable tree is following Linus' tree | 07:49 |
| wagi | I don't think master needs to be updated but if you want to update it, then I would just follow the origin tree's model | 07:51 |
| szlin | wagi: IIRC, we are using stable tree | 07:51 |
| szlin | iwamatsu: please correct me if I'm wrong | 07:51 |
| wagi | In this case I would just follow the stable tree | 07:51 |
| szlin | wagi: I see, that means the master branch in CIP = Linus' tree | 07:52 |
| wagi | I think all CIP related work should happen on branches | 07:52 |
| wagi | Linus -> gregkh -> cip | 07:53 |
| wagi | yes that makes sense | 07:53 |
| szlin | Fair enough | 07:53 |
| wagi | especially if gregkh's stable tree is our origin | 07:53 |
| wagi | I think most trees are organized this way | 07:54 |
| wagi | That is the development happens on branches not on the master | 07:55 |
| wagi | Makes it simpler to pull linus/origin/master into master and then rebase the work on it | 07:55 |
| wagi | Okay some of the trees are based on linux-next but that is advanced stuff we don't need :) | 07:56 |
| *** toscalix has joined #cip | 08:05 | |
| *** toscalix has joined #cip | 08:06 | |
| iwamatsu | I agree. The master branch doesn't need to be updated, but if I do, the stable tree's master is fine. | 08:06 |
| bwh | szlin: Since it is usually not possible to remove the master branch on a git server, I think it is best to make it point to the latest stable branch | 13:05 |
| *** iwamatsu has quit IRC | 19:05 | |
| *** iwamatsu_ has joined #cip | 19:05 | |
| *** toscalix has quit IRC | 19:06 | |
| *** 07IABH532 has joined #cip | 19:10 | |
| *** 07IABH532 has quit IRC | 19:10 | |
| *** rajm has quit IRC | 23:20 | |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!