On Wed, Oct 18, 2017 at 02:33:37PM +, Deucher, Alexander wrote:
Please fix your mail client to word wrap within paragraphs at something
substantially less than 80 columns. Doing this makes your messages much
easier to read and reply to.
> Your conflict change affectively reverted 1e444864833
On Wed, Oct 18, 2017 at 02:30:50PM +, Deucher, Alexander wrote:
> The patch below effectively reverts 1e4448648333a. If you drop the patch
> below, you should be fine.
As I said in my followup mail I've dropped all these patches due to
build failures, please resend both the pull request and
g List; alsa-devel@alsa-
> project.org
> Subject: Re: linux-next: manual merge of the sound-asoc tree with the drm-
> misc tree
>
> On Wed, Oct 18, 2017 at 10:57:33AM +0100, Mark Brown wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary. This
> >
ing List
> Subject: linux-next: manual merge of the sound-asoc tree with the drm-misc
> tree
>
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in:
>
> drivers/gpu/drm/amd/include/amd_shared.h
>
> between commit:
>
> cfa289fd49
On Wed, Oct 18, 2017 at 10:57:33AM +0100, Mark Brown wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for mergi
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
drivers/gpu/drm/amd/include/amd_shared.h
between commit:
cfa289fd4986c ("drm/amdgpu: rename amdgpu_dpm_funcs to amd_pm_funcs")
from the drm-misc tree and commit:
1e4448648333a ("drm/amdgpu Moving amdgpu asic type
6 matches
Mail list logo
