{"comment":{"url":"https://api.github.com/repos/raspberrypi/linux/comments/28696798","html_url":"https://github.com/raspberrypi/linux/commit/0d118e31780349beb5ffa1777fd77058cc464ad6#commitcomment-28696798","id":28696798,"user":{"login":"pelwell","id":8911409,"avatar_url":"https://avatars3.githubusercontent.com/u/8911409?v=4","gravatar_id":"","url":"https://api.github.com/users/pelwell","html_url":"https://github.com/pelwell","followers_url":"https://api.github.com/users/pelwell/followers","following_url":"https://api.github.com/users/pelwell/following{/other_user}","gists_url":"https://api.github.com/users/pelwell/gists{/gist_id}","starred_url":"https://api.github.com/users/pelwell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pelwell/subscriptions","organizations_url":"https://api.github.com/users/pelwell/orgs","repos_url":"https://api.github.com/users/pelwell/repos","events_url":"https://api.github.com/users/pelwell/events{/privacy}","received_events_url":"https://api.github.com/users/pelwell/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":null,"commit_id":"0d118e31780349beb5ffa1777fd77058cc464ad6","created_at":"2018-04-23T13:37:44Z","updated_at":"2018-04-23T13:37:44Z","author_association":"CONTRIBUTOR","body":"It sounds like the best way forward would be for you to switch to building the rpi-4.14.y-rt branch, feeding back any improvements you have.\r\n\r\nThe branch model for the `-rt` branch(es) mirrors the way the `rpi-` branches track upstream. Upstream (Linux) patches are always merged, not rebased. During the bring-up period for a new kernel version downstream patches can be rebased and squashed, but once it goes live we only use fast-forward commits, merging in upstream commits incrementally as they are released.\r\n\r\nFor the `-rt` branch, \"upstream\" is the appropriate `rpi-` branch, so `rpi-` commits (and the Linux commits it includes) are always merged, not rebased."}}
{"actor":{"display_login":"pelwell"}}