From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Takashi Iwai <tiwai@suse•de>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kees Cook <keescook@chromium•org>
Subject: Re: linux-next: manual merge of the tip tree with the sound tree
Date: Wed, 01 Nov 2017 08:14:14 +0100 [thread overview]
Message-ID: <s5hr2ticvy1.wl-tiwai@suse.de> (raw)
In-Reply-To: <20171101175359.4074a6af@canb.auug.org.au>
On Wed, 01 Nov 2017 07:53:59 +0100,
Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> sound/oss/midibuf.c
> sound/oss/soundcard.c
> sound/oss/sys_timer.c
> sound/oss/uart6850.c
>
> between commit:
>
> 727dede0ba8a ("sound: Retire OSS")
>
> from the sound tree and commit:
>
> 1d27e3e2252b ("timer: Remove expires and data arguments from DEFINE_TIMER")
>
> from the tip tree.
>
> I fixed it up (I just deleted the files) 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 merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Thanks, just removing the whole changes is correct.
Takashi
prev parent reply other threads:[~2017-11-01 7:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 6:53 linux-next: manual merge of the tip tree with the sound tree Stephen Rothwell
2017-11-01 7:14 ` Takashi Iwai [this message]
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=s5hr2ticvy1.wl-tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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