On Tue, 31 Jan 2017, Gerd Hoffmann <kraxel@xxxxxxxxxx> wrote: > Hi, > >> branches. One part that imo really should stick around is the drm-tip >> integration tree rebuilding. That allows us to distribute conflict >> handling (e.g. between drm-misc-fixes and drm-misc-next), and with more >> people and more drivers in drm-misc I expect more conflicts. > > Ok, good point. I see there is a separate "dim rebuild-top" command, so > that should be doable no matter how I actually apply the patches. > > Trying to run dim throws errors at me though: > > kraxel@nilsson ~/tmp/maintainer-tools (maintainer-tools)# ./dim help > ./dim: line 1602: declare: -n: invalid option > declare: usage: declare [-aAfFgilrtux] [-p] [name[=value] ...] > kraxel@nilsson ~/tmp/maintainer-tools (maintainer-tools)# bash --version > GNU bash, version 4.2.46(1)-release (x86_64-redhat-linux-gnu) declare -n introduced in bash 4.3 is needed for alias support. Workaround at [1]. [1] https://lists.freedesktop.org/archives/intel-gfx/2017-January/118474.html >> But dim apply-branch is a supposed to be a drop-in replacement for git >> apply-mbox, so should be simple to integrate into another set of scripts >> to manage the mails. And if there's changes to dim needed to make that >> happen, we can do that (we push patches to it at a regular pace). > > The patches tool prepares a mbox file, then runs "git am". Shouldn't be > that hard to make it configurable ... N.b. dim currently doesn't do all its magic, such as adding Link: tag, if you apply more than one patch at a time. If you apply a multi-patch mbox, only the last one will get the Link: tag. BR, Jani. >> > Ok. How quickly could I start using drm-misc? I have some pending >> > patches for the 4.11 merge window. Any chance I can push them through >> > drm-misc-next? Or should I better send a pull req to Dave? >> >> If you want you can get started right away. I plan to type some small docs >> for this experiment, but the only thing you need is an fdo account with >> drm-misc commit rights. Simplest to ping me (and fdo admins) on >> #dri-devel. > > Ok. > > cheers, > Gerd > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
