linux-next: manual merge of the trivial tree with the wireless tree

linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
("ath9k_hw: turn a few big macros into functions") from the wireless tree
and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
trivial tree.

The former commit removed the code that the latter changed, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Justin P. Mattock]

On 04/10/2011 08:28 PM, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
> ("ath9k_hw: turn a few big macros into functions") from the wireless tree
> and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
> trivial tree.
>
> The former commit removed the code that the latter changed, so I did that.

yikes... I dont like seeing that.. what can I do to help with this?

Justin P. Mattock

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Jiri Kosina]

On Mon, 11 Apr 2011, Justin P. Mattock wrote:

> > Today's linux-next merge of the trivial tree got a conflict in
> > drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
> > ("ath9k_hw: turn a few big macros into functions") from the wireless tree
> > and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
> > trivial tree.
> > 
> > The former commit removed the code that the latter changed, so I did that.
> 
> yikes... I dont like seeing that.. what can I do to help with this?

No need for you to do anything. I'll resolve the conflict.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Justin P. Mattock]

On 04/11/2011 08:17 AM, Jiri Kosina wrote:
> On Mon, 11 Apr 2011, Justin P. Mattock wrote:
>
>>> Today's linux-next merge of the trivial tree got a conflict in
>>> drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
>>> ("ath9k_hw: turn a few big macros into functions") from the wireless tree
>>> and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
>>> trivial tree.
>>>
>>> The former commit removed the code that the latter changed, so I did that.
>>
>> yikes... I dont like seeing that.. what can I do to help with this?
>
> No need for you to do anything. I'll resolve the conflict.
>

o.k.!

Justin P. Mattock

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Jiri Kosina]

On Mon, 11 Apr 2011, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
> ("ath9k_hw: turn a few big macros into functions") from the wireless tree
> and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
> trivial tree.
> 
> The former commit removed the code that the latter changed, so I did that.

I have reverted the chunk in question, so the conflict should be gone.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/time-event.c between commit 057397943eee
("iwlwifi: mvm: disconnect if time event scheduling fails") from the
wireless tree and commit 0b1587b18bfe ("treewide: Fix typo in printk")
from the trivial tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
index c17b74c,39b3ffb..0000000
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@@ -198,12 -180,19 +198,12 @@@ static void iwl_mvm_te_handle_notif(str
  		 * By now, we should have finished association
  		 * and know the dtim period.
  		 */
 -		if (te_data->vif->type == NL80211_IFTYPE_STATION &&
 -		    (!te_data->vif->bss_conf.assoc ||
 -		     !te_data->vif->bss_conf.dtim_period)) {
 -			IWL_ERR(mvm,
 -				"No association and the time event is over already...\n");
 -			ieee80211_connection_loss(te_data->vif);
 -		}
 -
 +		iwl_mvm_te_check_disconnect(mvm, te_data->vif,
- 			"No assocation and the time event is over already...");
++			"No association and the time event is over already...");
  		iwl_mvm_te_clear_data(mvm, te_data);
 -	} else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
 +	} else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
  		te_data->running = true;
 -		te_data->end_jiffies = jiffies +
 -			TU_TO_JIFFIES(te_data->duration);
 +		te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
  
  		if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
  			set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);

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

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Jiri Kosina]

On Wed, 27 Apr 2011, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/rtlwifi/pci.c between commit c7cfe38ee0f9 ("rtlwifi:
> Convert pci routines for addition of rtl8192se and rtl8192de") from the
> wireless tree and commit 6eab04a87677 ("treewide: remove extra
> semicolons") from the trivial tree.
> 
> The former removed the code that the latter fixed.

OK, I have reverted that particular hunk.

Thanks for reporting,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rtlwifi/pci.c between commit c7cfe38ee0f9 ("rtlwifi:
Convert pci routines for addition of rtl8192se and rtl8192de") from the
wireless tree and commit 6eab04a87677 ("treewide: remove extra
semicolons") from the trivial tree.

The former removed the code that the latter fixed.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

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

Hi Jiri,

On Tue, 17 Nov 2009 23:18:25 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> Thanks for letting me know, I have dropped the rt2800usb bits from my 
> queue, so this conflict should now be gone.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Jiri Kosina]

On Tue, 17 Nov 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
> wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
> ("tree-wide: fix assorted typos all over the place") from the trivial
> tree.
> 
> The wireless tree commits moved the code fixed by the trivial tree, but
> also fixed it along the way, so I have ignored the trivial fixup for this
> file.

Thanks for letting me know, I have dropped the rt2800usb bits from my 
queue, so this conflict should now be gone.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
("tree-wide: fix assorted typos all over the place") from the trivial
tree.

The wireless tree commits moved the code fixed by the trivial tree, but
also fixed it along the way, so I have ignored the trivial fixup for this
file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Johannes Berg]

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

On Wed, 2009-06-03 at 10:07 +0200, Jiri Kosina wrote:
> On Wed, 3 Jun 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in 
> > Documentation/rfkill.txt between commit 
> > c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the 
> > wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386 
> > ("trivial: Miscellaneous documentation typo fixes") from the trivial 
> > tree.
> > I just used the version from the wireless tree since it has been
> > basically rewritten there (except I applied the "transmiter" to
> > "transmitter" fix - see below).  Maybe the part of the trivial tree patch
> > that affects this file should be dropped.
> 
> Hi,
> 
> thanks for letting me know. I have dropped the Documentation/rfkill.txt 
> hunk completely. 
> 
> Wireless guys, will you please apply the transmiter -> transmitter fix to 
> your tree?

Will do.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: linux-next: manual merge of the trivial tree with the wireless tree

[Jiri Kosina]

On Wed, 3 Jun 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in 
> Documentation/rfkill.txt between commit 
> c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the 
> wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386 
> ("trivial: Miscellaneous documentation typo fixes") from the trivial 
> tree.
> I just used the version from the wireless tree since it has been
> basically rewritten there (except I applied the "transmiter" to
> "transmitter" fix - see below).  Maybe the part of the trivial tree patch
> that affects this file should be dropped.

Hi,

thanks for letting me know. I have dropped the Documentation/rfkill.txt 
hunk completely. 

Wireless guys, will you please apply the transmiter -> transmitter fix to 
your tree?

Thanks.

> --- a/Documentation/rfkill.txt
> +++ b/Documentation/rfkill.txt
> @@@ -111,20 -545,31 +111,20 @@@ The following sysfs entries exist for e
>   	type: Name of the key type ("wlan", "bluetooth", etc).
>   	state: Current state of the transmitter
>   		0: RFKILL_STATE_SOFT_BLOCKED
>  -			transmitter is forced off, but one can override it
>  -			by a write to the state attribute;
>  +			transmitter is turned off by software
>   		1: RFKILL_STATE_UNBLOCKED
> - 			transmiter is (potentially) active
>  -			transmitter is NOT forced off, and may operate if
>  -			all other conditions for such operation are met
>  -			(such as interface is up and configured, etc);
> ++			transmitter is (potentially) active
>   		2: RFKILL_STATE_HARD_BLOCKED
>   			transmitter is forced off by something outside of
>  -			the driver's control.  One cannot set a device to
>  -			this state through writes to the state attribute;
>  -	claim: 1: Userspace handles events, 0: Kernel handles events
>  -
>  -Both the "state" and "claim" entries are also writable. For the "state" entry
>  -this means that when 1 or 0 is written, the device rfkill state (if not yet in
>  -the requested state), will be will be toggled accordingly.
>  -
>  -For the "claim" entry writing 1 to it means that the kernel no longer handles
>  -key events even though RFKILL_INPUT input was enabled. When "claim" has been
>  -set to 0, userspace should make sure that it listens for the input events or
>  -check the sysfs "state" entry regularly to correctly perform the required tasks
>  -when the rkfill key is pressed.
>  -
>  -A note about input devices and EV_SW events:
>  -
>  -In order to know the current state of an input device switch (like
>  -SW_RFKILL_ALL), you will need to use an IOCTL.  That information is not
>  -available through sysfs in a generic way at this time, and it is not available
>  -through the rfkill class AT ALL.
>  +			the driver's control.
>  +	claim: 0: Kernel handles events (currently always reads that value)
>  +
>  +rfkill devices also issue uevents (with an action of "change"), with the
>  +following environment variables set:
>  +
>  +RFKILL_NAME
>  +RFKILL_STATE
>  +RFKILL_TYPE
>  +
>  +The contents of these variables corresponds to the "name", "state" and
>  +"type" sysfs files explained above.
> 

-- 
Jiri Kosina
SUSE Labs

linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/rfkill.txt between commit
c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the
wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386
("trivial: Miscellaneous documentation typo fixes") from the trivial tree.

I just used the version from the wireless tree since it has been
basically rewritten there (except I applied the "transmiter" to
"transmitter" fix - see below).  Maybe the part of the trivial tree patch
that affects this file should be dropped.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/rfkill.txt
index de941e3,bb17c65..0000000
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
@@@ -111,20 -545,31 +111,20 @@@ The following sysfs entries exist for e
  	type: Name of the key type ("wlan", "bluetooth", etc).
  	state: Current state of the transmitter
  		0: RFKILL_STATE_SOFT_BLOCKED
 -			transmitter is forced off, but one can override it
 -			by a write to the state attribute;
 +			transmitter is turned off by software
  		1: RFKILL_STATE_UNBLOCKED
- 			transmiter is (potentially) active
 -			transmitter is NOT forced off, and may operate if
 -			all other conditions for such operation are met
 -			(such as interface is up and configured, etc);
++			transmitter is (potentially) active
  		2: RFKILL_STATE_HARD_BLOCKED
  			transmitter is forced off by something outside of
 -			the driver's control.  One cannot set a device to
 -			this state through writes to the state attribute;
 -	claim: 1: Userspace handles events, 0: Kernel handles events
 -
 -Both the "state" and "claim" entries are also writable. For the "state" entry
 -this means that when 1 or 0 is written, the device rfkill state (if not yet in
 -the requested state), will be will be toggled accordingly.
 -
 -For the "claim" entry writing 1 to it means that the kernel no longer handles
 -key events even though RFKILL_INPUT input was enabled. When "claim" has been
 -set to 0, userspace should make sure that it listens for the input events or
 -check the sysfs "state" entry regularly to correctly perform the required tasks
 -when the rkfill key is pressed.
 -
 -A note about input devices and EV_SW events:
 -
 -In order to know the current state of an input device switch (like
 -SW_RFKILL_ALL), you will need to use an IOCTL.  That information is not
 -available through sysfs in a generic way at this time, and it is not available
 -through the rfkill class AT ALL.
 +			the driver's control.
 +	claim: 0: Kernel handles events (currently always reads that value)
 +
 +rfkill devices also issue uevents (with an action of "change"), with the
 +following environment variables set:
 +
 +RFKILL_NAME
 +RFKILL_STATE
 +RFKILL_TYPE
 +
 +The contents of these variables corresponds to the "name", "state" and
 +"type" sysfs files explained above.