backports: take us up to next-20130501
cover backports: take us up to next-20130501
From: "Luis R. Rodriguez" <[email protected]>
Only 1 change needed.
Luis R. Rodriguez (3):
backports: address NFC LLCP code shift
backports: refresh patches for next-20130430
backports: refresh patches for next-20130501
copy-list | 1 - .../drivers_gpu_drm_i915_intel_opregion.patch | 2 +- .../media/0002-dma_mmap_coherent-revert.patch | 4 ++-- .../nfc/01-netlink-portid/net_nfc_netlink.patch | 14 +++++++------- 4 files changed, 10 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/3 backports: address NFC LLCP code shift
From: "Luis R. Rodriguez" <[email protected]>
Samuel folded code under net/nfc/llcp/ onto
the parent net/nfc/ directory with llcp_ prefixes
for the files. Address this change introduced
as of next-20130430.
commit 30cc4587659e1c9b1bfade8b2a757d91e04758ab
Author: Samuel Ortiz <[email protected]> Date: Fri Apr 26 11:49:40 2013 +0200
NFC: Move LLCP code to the NFC top level diirectory
And stop making it optional. LLCP is a fundamental part of the NFC specifications and making it optional does not make much sense.
--- copy-list | 1 - 1 file changed, 1 deletion(-)
copy-list +0 -1
@@ -129,7 +129,6 @@ drivers/gpu/drm/ # NFC core net/nfc/ net/nfc/hci/ -net/nfc/llcp/ net/nfc/nci/ include/net/nfc/ include/uapi/linux/nfc.h
Signature · 1 line
1.7.10.4
Re: [PATCH 1/3] backports: address NFC LLCP code shift
Quoted 28 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
Samuel folded code under
net/nfc/llcp/onto
the parentnet/nfc/directory withllcp_prefixes
for the files. Address this change introduced
as of next-20130430.commit
30cc4587659e1c9b1bfade8b2a757d91e04758abAuthor: Samuel Ortiz <[email protected]> Date: Fri Apr 26 11:49:40 2013 +0200NFC: Move LLCP code to the NFC top level diirectory
And stop making it optional. LLCP is a fundamental part of the NFC specifications and making it optional does not make much sense.
Signed-off-by Samuel Ortiz <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>--- copy-list | 1 - 1 file changed, 1 deletion(-)copy-list +0
-0
copy-list drivers/gpu/drm/ · line 132
Quoted 4 lines
copy-list +0
-1@@ -129,7 +129,6 @@ drivers/gpu/drm/ # NFC core net/nfc/ net/nfc/hci/ -net/nfc/llcp/
There isn't really any point in listing net/nfc/ and net/nfc/hci/, I'll make a follow-up patch to remove all the subdirs that aren't needed. Copying is recursive, after all.
johannes
PATCH 2/3 backports: refresh patches for next-20130430
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ]
real 30m45.327s user 814m25.678s sys 128m22.341s
--- .../media/0002-dma_mmap_coherent-revert.patch | 4 ++-- .../nfc/01-netlink-portid/net_nfc_netlink.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-)
patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch +2 -2
@@ -25,7 +25,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -186,6 +186,52 @@ static void *vb2_dc_alloc(void *alloc_ct +@@ -183,6 +183,52 @@ static void *vb2_dc_alloc(void *alloc_ct return buf; }
@@ -78,7 +78,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; -@@ -222,6 +238,7 @@ static int vb2_dc_mmap(void *buf_priv, s +@@ -219,6 +265,7 @@ static int vb2_dc_mmap(void *buf_priv, s return 0; }
patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch +7 -7
@@ -1,6 +1,6 @@ --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c -@@ -69,7 +69,7 @@ static int nfc_genl_send_target(struct s +@@ -68,7 +68,7 @@ static int nfc_genl_send_target(struct s { void *hdr;
@@ -9,7 +9,7 @@ &nfc_genl_family, flags, NFC_CMD_GET_TARGET); if (!hdr) return -EMSGSIZE; -@@ -482,7 +482,7 @@ static int nfc_genl_dump_devices(struct +@@ -481,7 +481,7 @@ static int nfc_genl_dump_devices(struct while (dev) { int rc;
@@ -18,7 +18,7 @@ cb->nlh->nlmsg_seq, cb, NLM_F_MULTI); if (rc < 0) break; -@@ -601,7 +601,7 @@ static int nfc_genl_get_device(struct sk +@@ -600,7 +600,7 @@ static int nfc_genl_get_device(struct sk goto out_putdev; }
@@ -27,7 +27,7 @@ NULL, 0); if (rc < 0) goto out_free; -@@ -692,7 +692,7 @@ static int nfc_genl_start_poll(struct sk +@@ -691,7 +691,7 @@ static int nfc_genl_start_poll(struct sk rc = nfc_start_poll(dev, im_protocols, tm_protocols); if (!rc)
@@ -36,7 +36,7 @@ mutex_unlock(&dev->genl_data.genl_data_mutex); -@@ -726,7 +726,7 @@ static int nfc_genl_stop_poll(struct sk_ +@@ -725,7 +725,7 @@ static int nfc_genl_stop_poll(struct sk_ mutex_lock(&dev->genl_data.genl_data_mutex);
@@ -45,7 +45,7 @@ rc = -EBUSY; goto out; } -@@ -852,7 +852,7 @@ static int nfc_genl_llc_get_params(struc +@@ -851,7 +851,7 @@ static int nfc_genl_llc_get_params(struc goto exit; }
@@ -54,7 +54,7 @@ exit: device_unlock(&dev->dev); -@@ -1135,12 +1135,12 @@ static int nfc_genl_rcv_nl_event(struct +@@ -1134,12 +1134,12 @@ static int nfc_genl_rcv_nl_event(struct if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC) goto out;
Signature · 1 line
1.7.10.4
PATCH 3/3 backports: refresh patches for next-20130501
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ]
real 30m46.042s user 816m2.488s sys 126m33.079s
--- .../drivers_gpu_drm_i915_intel_opregion.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c -@@ -259,6 +259,9 @@ static int intel_opregion_video_event(st +@@ -250,6 +250,9 @@ static int intel_opregion_video_event(st struct acpi_bus_event *event = data; int ret = NOTIFY_OK;
Signature · 1 line
1.7.10.4
Johannes Berg
AppliedQuoted 3 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
Only 1 change needed.
Thanks, applied.
johannes