All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Stanislaw Gruszka <sgruszka@redhat.com>
Subject: linux-next: manual merge of the net-next tree with the wireless tree
Date: Tue, 26 Mar 2013 11:51:20 +1100	[thread overview]
Message-ID: <20130326115120.054f909e36cdc63b5607a8a8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/wireless/core.h between commit f9f475292dbb ("cfg80211: always check
for scan end on P2P device") from the wireless tree and commit
812569699119 ("cfg80211/mac80211: disconnect on suspend") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Stephen Rothwell <sfr@canb.auug.org.au>

diff --cc net/wireless/core.h
index 5845c2b,d5d06fd..0000000
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@@ -503,9 -500,9 +500,12 @@@ int cfg80211_validate_beacon_int(struc
  void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
  			       enum nl80211_iftype iftype, int num);
  
 +void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
 +			      struct wireless_dev *wdev);
 +
+ void cfg80211_leave(struct cfg80211_registered_device *rdev,
+ 		    struct wireless_dev *wdev);
+ 
  #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
  
  #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Stanislaw Gruszka <sgruszka@redhat.com>
Subject: linux-next: manual merge of the net-next tree with the wireless tree
Date: Tue, 26 Mar 2013 11:51:20 +1100	[thread overview]
Message-ID: <20130326115120.054f909e36cdc63b5607a8a8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/wireless/core.h between commit f9f475292dbb ("cfg80211: always check
for scan end on P2P device") from the wireless tree and commit
812569699119 ("cfg80211/mac80211: disconnect on suspend") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Stephen Rothwell <sfr@canb.auug.org.au>

diff --cc net/wireless/core.h
index 5845c2b,d5d06fd..0000000
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@@ -503,9 -500,9 +500,12 @@@ int cfg80211_validate_beacon_int(struc
  void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
  			       enum nl80211_iftype iftype, int num);
  
 +void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
 +			      struct wireless_dev *wdev);
 +
+ void cfg80211_leave(struct cfg80211_registered_device *rdev,
+ 		    struct wireless_dev *wdev);
+ 
  #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
  
  #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-03-26  0:51 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-26  0:51 Stephen Rothwell [this message]
2013-03-26  0:51 ` linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-10-24  0:24 Stephen Rothwell
2023-10-12  0:37 Stephen Rothwell
2023-10-12  8:10 ` Johannes Berg
2023-10-19 21:40   ` Jakub Kicinski
2023-10-20  5:49     ` Johannes Berg
2014-07-24  2:47 Stephen Rothwell
2014-07-24  2:47 ` Stephen Rothwell
2014-07-23  2:00 Stephen Rothwell
2014-07-23  2:00 ` Stephen Rothwell
2014-05-23  3:45 Stephen Rothwell
2014-05-23  3:45 ` Stephen Rothwell
2014-02-26  3:21 Stephen Rothwell
2014-02-26  3:21 ` Stephen Rothwell
2014-02-21  2:34 Stephen Rothwell
2014-02-21  2:34 ` Stephen Rothwell
2013-09-27  3:03 Stephen Rothwell
2013-09-27  3:03 ` Stephen Rothwell
2013-08-27  4:10 Stephen Rothwell
2013-08-27  4:10 ` Stephen Rothwell
2013-04-04  0:44 Stephen Rothwell
2013-04-04  0:44 ` Stephen Rothwell
2013-05-02  3:19 ` Stephen Rothwell
2013-05-02  3:19   ` Stephen Rothwell
2013-04-02  2:00 Stephen Rothwell
2013-04-02  2:00 ` Stephen Rothwell
2013-04-02  9:30 ` Samuel Ortiz
2013-03-26  0:48 Stephen Rothwell
2013-03-26  0:48 ` Stephen Rothwell
2012-07-03  1:44 Stephen Rothwell
2012-07-03  1:44 ` Stephen Rothwell
2012-07-03  2:33 ` John W. Linville
2012-06-14  3:12 Stephen Rothwell
2012-06-14  3:12 ` Stephen Rothwell
2012-06-14  4:50 ` Mohammed Shafi Shajakhan
2012-06-14  4:50   ` Mohammed Shafi Shajakhan
2012-06-14 12:59   ` John W. Linville
2012-05-04  3:21 Stephen Rothwell
2012-05-04  3:21 ` Stephen Rothwell
2012-05-04  4:35 ` Guy, Wey-Yi
2012-02-16  1:40 Stephen Rothwell
2012-02-16  1:40 ` Stephen Rothwell
2012-02-16  1:37 Stephen Rothwell
2012-02-16  1:37 ` Stephen Rothwell
2011-12-20  2:02 Stephen Rothwell
2011-12-20  2:02 ` Stephen Rothwell
2011-12-15  2:53 Stephen Rothwell
2011-12-15  2:53 ` Stephen Rothwell
2011-12-15  3:16 ` Stephen Rothwell
2011-12-15  3:16   ` 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=20130326115120.054f909e36cdc63b5607a8a8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    --cc=sgruszka@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.