linux-kernel - linux-next: manual merge of the tip tree with the sound tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20171101175359.4074a6af@canb.auug.org.au>
Date:   Wed, 1 Nov 2017 17:53:59 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Takashi Iwai <tiwai@...e.de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>
Subject: linux-next: manual merge of the tip tree with the sound tree

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