From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Kalle Valo <kvalo@codeaurora•org>,
Wireless <linux-wireless@vger•kernel.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Luca Coelho <luciano.coelho@intel•com>
Subject: linux-next: manual merge of the net-next tree with the wireless-drivers tree
Date: Mon, 29 Apr 2019 11:54:02 +1000 [thread overview]
Message-ID: <20190429115338.5decb50b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 959 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
between commits:
154d4899e411 ("iwlwifi: mvm: properly check debugfs dentry before using it")
d156e67d3f58 ("iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()")
from the wireless-drivers tree and commit:
c9af7528c331 ("iwlwifi: mvm: no need to check return value of debugfs_create functions")
from the net-next tree.
I fixed it up (the latter removed the code modified by the former, so I
just did 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-29 1:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 1:54 Stephen Rothwell [this message]
2019-04-29 5:19 ` linux-next: manual merge of the net-next tree with the wireless-drivers tree Luca Coelho
-- strict thread matches above, loose matches on Subject: below --
2016-05-09 0:39 Stephen Rothwell
2016-05-10 6:43 ` Kalle Valo
2016-02-29 1:56 Stephen Rothwell
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=20190429115338.5decb50b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=luciano.coelho@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/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