From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753840AbdF1DWv (ORCPT ); Tue, 27 Jun 2017 23:22:51 -0400 Received: from ozlabs.org ([103.22.144.67]:46635 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753453AbdF1DWq (ORCPT ); Tue, 27 Jun 2017 23:22:46 -0400 Date: Wed, 28 Jun 2017 13:22:43 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Gustavo Padovan Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Jeffy Chen , Marcel Holtmann Subject: linux-next: manual merge of the tip tree with the bluetooth tree Message-ID: <20170628132243.7f0833bd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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