* linux-next: manual merge of the tip tree with the sound tree
@ 2017-11-01 6:53 Stephen Rothwell
2017-11-01 7:14 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-11-01 6:53 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Takashi Iwai
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook
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.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tip tree with the sound tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2017-11-01 7:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Takashi Iwai, Linux-Next Mailing List, Linux Kernel Mailing List,
Kees Cook
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-01 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).