linux-kernel - linux-next: manual merge of the tip tree with the bluetooth 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>] [day] [month] [year] [list]

Message-ID: <20170628132243.7f0833bd@canb.auug.org.au>
Date:   Wed, 28 Jun 2017 13:22:43 +1000
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>,
        Gustavo Padovan <gustavo@...ovan.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jeffy Chen <jeffy.chen@...k-chips.com>,
        Marcel Holtmann <marcel@...tmann.org>
Subject: linux-next: manual merge of the tip tree with the bluetooth tree

Hi all,

Today's linux-next merge of the tip tree got conflicts in:

  net/bluetooth/bnep/core.c
  net/bluetooth/cmtp/core.c
  net/bluetooth/hidp/core.c

between commits:

  25717382c1dd ("Bluetooth: bnep: fix possible might sleep error in bnep_session")
  f06d977309d0 ("Bluetooth: cmtp: fix possible might sleep error in cmtp_session")
  5da8e47d849d ("Bluetooth: hidp: fix possible might sleep error in hidp_session_thread")

from the bluetooth tree and commit:

  ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t")

from the tip tree.

I fixed it up (the former changed the wait_queue_t declarations
to DEFINE_WAIT_FUNC(), so I used that) 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