From: Samuel Ortiz <sameo@linux.intel.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Linux NFC <linux-nfc@lists.01.org>, netdev@vger.kernel.org
Subject: [GIT] [4.6] NFC update
Date: Fri, 11 Mar 2016 21:48:57 +0100 [thread overview]
Message-ID: <20160311204857.GB29902@zurbaran.home> (raw)
Hi David,
This is a very small one this time, with only 5 patches.
There are a couple of big items that could not be merged/finished
on time.
We have:
- 2 LLCP fixes for a race and a potential OOM.
- 2 cleanups for the pn544 and microread drivers.
- 1 Maintainer addition for the s3fwrn5 driver.
The following changes since commit 667f00630ebefc4d73aa105c6ab254e4aec867f8:
Merge branch 'local-checksum-offload' (2016-02-12 05:52:41 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-4.6-1
for you to fetch changes up to 079c2652e5af648db6bf4f54bcafdafcc57a0d2c:
MAINTAINERS: nfc: s3fwrn5: Add second maintainer (2016-03-10 17:16:22 +0100)
----------------------------------------------------------------
Cong Wang (2):
NFC: Use GFP_USER for user-controlled kmalloc
NFC: Close a race condition in llcp_sock_getname()
Jean Delvare (1):
NFC: microread: Drop platform data header file
Mika Westerberg (1):
NFC: pn544: Drop two useless checks in ACPI probe path
Robert Baldyga (1):
MAINTAINERS: nfc: s3fwrn5: Add second maintainer
MAINTAINERS | 2 +-
drivers/nfc/microread/i2c.c | 8 --------
drivers/nfc/pn544/i2c.c | 14 +------------
include/linux/platform_data/microread.h | 35 ---------------------------------
net/nfc/llcp_commands.c | 4 ++--
net/nfc/llcp_sock.c | 6 ++++++
6 files changed, 10 insertions(+), 59 deletions(-)
delete mode 100644 include/linux/platform_data/microread.h
next reply other threads:[~2016-03-11 20:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-11 20:48 Samuel Ortiz [this message]
2016-03-14 2:43 ` [GIT] [4.6] NFC update David Miller
-- strict thread matches above, loose matches on Subject: below --
2016-05-11 9:11 Samuel Ortiz
2016-05-12 3:43 ` David Miller
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=20160311204857.GB29902@zurbaran.home \
--to=sameo@linux.intel.com \
--cc=davem@davemloft.net \
--cc=linux-nfc@lists.01.org \
--cc=netdev@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).