2014-01-04 23:48:22

by Samuel Ortiz

[permalink] [raw]
Subject: [GIT] [3.12] NFC fix

Hi John,

Hopefully it's not too late for a 3.12 fix for NFC. Please let me know
if it is, and I'll add it to my 3.13 pull request.

This pull request only contains one fix for a regression introduced with
commit e29a9e2ae165620d. Without this fix, we can not establish a p2p link
in target mode. Only initiator mode works.

The following changes since commit b7e047358449f8eb5cba8197b42280b676b82e54:

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (2013-12-18 13:46:08 -0500)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.12-1

for you to fetch changes up to d31652a26bc9e752a99b6ac3b61353129934e451:

NFC: Fix target mode p2p link establishment (2014-01-04 03:31:32 +0100)

----------------------------------------------------------------
Arron Wang (1):
NFC: Fix target mode p2p link establishment

net/nfc/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--
Intel Open Source Technology Centre
http://oss.intel.com/


2014-01-06 20:09:04

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [GIT] [3.12] NFC fix

Hi John,

On Mon, Jan 06, 2014 at 02:22:42PM -0500, John W. Linville wrote:
> 3.13 is the current stream.
Argh, sorry about that.

> Do you want to adjust your tag name?
Tag name and message adjusted. The new pull request URL is:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.13-1

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2014-01-08 18:45:17

by John W. Linville

[permalink] [raw]
Subject: Re: [GIT] [3.12] NFC fix

On Mon, Jan 06, 2014 at 09:09:01PM +0100, Samuel Ortiz wrote:
> Hi John,
>
> On Mon, Jan 06, 2014 at 02:22:42PM -0500, John W. Linville wrote:
> > 3.13 is the current stream.
> Argh, sorry about that.
>
> > Do you want to adjust your tag name?
> Tag name and message adjusted. The new pull request URL is:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.13-1
>
> Cheers,
> Samuel.

Pulling now, but there are no guarantees that Dave will take my next pull request...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2014-01-06 19:30:21

by John W. Linville

[permalink] [raw]
Subject: Re: [GIT] [3.12] NFC fix

3.13 is the current stream. Do you want to adjust your tag name?

John

On Sun, Jan 05, 2014 at 12:48:02AM +0100, Samuel Ortiz wrote:
> Hi John,
>
> Hopefully it's not too late for a 3.12 fix for NFC. Please let me know
> if it is, and I'll add it to my 3.13 pull request.
>
> This pull request only contains one fix for a regression introduced with
> commit e29a9e2ae165620d. Without this fix, we can not establish a p2p link
> in target mode. Only initiator mode works.
>
> The following changes since commit b7e047358449f8eb5cba8197b42280b676b82e54:
>
> Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (2013-12-18 13:46:08 -0500)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.12-1
>
> for you to fetch changes up to d31652a26bc9e752a99b6ac3b61353129934e451:
>
> NFC: Fix target mode p2p link establishment (2014-01-04 03:31:32 +0100)
>
> ----------------------------------------------------------------
> Arron Wang (1):
> NFC: Fix target mode p2p link establishment
>
> net/nfc/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --
> Intel Open Source Technology Centre
> http://oss.intel.com/
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.