From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: please clean up the hid tree
Date: Wed, 13 Jul 2016 11:20:01 +1000 [thread overview]
Message-ID: <20160713112001.641f6bf1@canb.auug.org.au> (raw)
In-Reply-To: <20160713092809.566559b5@canb.auug.org.au>
Hi Jiri,
On Wed, 13 Jul 2016 09:28:09 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> The hid tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
> seems to be based on v3.19 and constists of a large number of merges
> (of stuff that is now in Linus' tree) and ends with one particulary
> large revert (of a merge).
What I forgot to say is that that last revert creates lots of conflicts
when I merge your tree:
CONFLICT (content): Merge conflict in sound/pci/hda/patch_realtek.c
CONFLICT (content): Merge conflict in mm/shmem.c
CONFLICT (content): Merge conflict in fs/dcache.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap-smp.c
CONFLICT (content): Merge conflict in Makefile
So I have just dropped the hid tree until it is cleaned up.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-07-13 1:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 23:28 linux-next: please clean up the hid tree Stephen Rothwell
2016-07-13 1:20 ` Stephen Rothwell [this message]
2016-07-13 9:21 ` Jiri Kosina
2016-07-13 15:24 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160713112001.641f6bf1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jikos@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox