From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Gustavo Padovan <gustavo@padovan•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jeffy Chen <jeffy.chen@rock-chips•com>,
Marcel Holtmann <marcel@holtmann•org>
Subject: linux-next: manual merge of the tip tree with the bluetooth tree
Date: Wed, 28 Jun 2017 13:22:43 +1000 [thread overview]
Message-ID: <20170628132243.7f0833bd@canb.auug.org.au> (raw)
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
reply other threads:[~2017-06-28 3:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170628132243.7f0833bd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavo@padovan$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=jeffy.chen@rock-chips$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcel@holtmann$(echo .)org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--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