search for: rerer

On 19 Oct 2015, at 19:05, Bruce Hoult via llvm-dev <llvm-dev at lists.llvm.org> wrote: > > I find the git imerge script extremely useful for this kind of situation. > > https://github.com/mhagger/git-imerge > > Logically, it does something similar to rebasing your local branch onto EVERY commit in the upstream branch, in turn, until it finds conflicts. There is

...specially scary. > > But I think I managed to apply the patches and push the > branch now. Except when you're racing with someone else you should only see conflicts with stuff you've just pushed. Or if someone forgot to fix up their mess. What was the conflict? Looking at the git-rerere log I'm not exactly sure what happened ... Looks like only one of the patches didn't apply cleanly anymore because it was somewhat outdated. Otherwise nothing from you. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

...ago: a201c6ee37d6 ("drm/xe/bo: Evict VRAM to TT rather than to > > system") > > oh, no... apparently that commit is? from a long time ago. The > problem > was that drm-misc-next was not yet in sync with drm-next. Thomas, do > you > have a fixup for this to put in rerere? > > Lucas De Marchi I added this as a manual fixup and ran some quick igt tests. Seems to work.

Because all drivers currently use gem objects for framebuffer planes, the virtual create_handle() is not required. This change adds a struct drm_gem_object *gems[4] field to drm_framebuffer and removes create_handle() function pointer from drm_framebuffer_funcs. The corresponding *_create_handle() function is removed from each driver. In many cases this change eliminates a struct *_framebuffer

Because all drivers currently use gem objects for framebuffer planes, the virtual create_handle() is not required. This change adds a struct drm_gem_object *gems[4] field to drm_framebuffer and removes create_handle() function pointer from drm_framebuffer_funcs. The corresponding *_create_handle() function is removed from each driver. In many cases this change eliminates a struct *_framebuffer

Because all drivers currently use gem objects for framebuffer planes, the virtual create_handle() is not required. This change adds a struct drm_gem_object *gems[4] field to drm_framebuffer and removes create_handle() function pointer from drm_framebuffer_funcs. The corresponding *_create_handle() function is removed from each driver. In many cases this change eliminates a struct *_framebuffer