rpms/kernel/devel patch-2.6.33-rc7-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.1164, 1.1165 git-bluetooth.patch, 1.3, 1.4 kernel.spec, 1.1924, 1.1925 sources, 1.1123, 1.1124 upstream, 1.1036, 1.1037 fix-conntrack-bug-with-namespaces.patch, 1.1, NONE
Chuck Ebbert
cebbert at fedoraproject.org
Thu Feb 11 06:38:21 UTC 2010
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16299
Modified Files:
.cvsignore git-bluetooth.patch kernel.spec sources upstream
Added Files:
patch-2.6.33-rc7-git5.bz2.sign
Removed Files:
fix-conntrack-bug-with-namespaces.patch
Log Message:
2.6.33-rc7-git5
Drop merged patches:
fix-conntrack-bug-with-namespaces.patch
commit ad60a9154887bb6162e427b0969fefd2f34e94a6 from git-bluetooth.patch
--- NEW FILE patch-2.6.33-rc7-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLc0r0yGugalF9Dw4RAmkDAKCD4ufA5FLECZAyEJcNyb58E3m33wCgibiD
4BCYhWXIvtoKMgCLNOVAFYY=
=ZlxS
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1164
retrieving revision 1.1165
diff -u -p -r1.1164 -r1.1165
--- .cvsignore 6 Feb 2010 23:14:40 -0000 1.1164
+++ .cvsignore 11 Feb 2010 06:38:19 -0000 1.1165
@@ -6,3 +6,4 @@ temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
patch-2.6.33-rc7.bz2
+patch-2.6.33-rc7-git5.bz2
git-bluetooth.patch:
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-sony.c | 21 +++++++++++++++++++--
drivers/hid/hid-wacom.c | 28 ++++++++++++++++++++++++++++
drivers/hid/hidraw.c | 2 +-
drivers/hid/usbhid/hid-core.c | 5 +++--
include/linux/hid.h | 2 +-
net/bluetooth/hidp/core.c | 17 ++++++++++++++---
7 files changed, 67 insertions(+), 9 deletions(-)
Index: git-bluetooth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-bluetooth.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- git-bluetooth.patch 7 Feb 2010 02:23:38 -0000 1.3
+++ git-bluetooth.patch 11 Feb 2010 06:38:19 -0000 1.4
@@ -1,19 +1,3 @@
-commit ad60a9154887bb6162e427b0969fefd2f34e94a6
-Author: Michael Poole <mdpoole at troilus.org>
-Date: Fri Feb 5 12:23:43 2010 -0500
-
- Bluetooth: Keep a copy of each HID device's report descriptor
-
- The report descriptor is read by user space (via the Service
- Discovery Protocol), so it is only available during the ioctl
- to connect. However, the HID probe function that needs the
- descriptor might not be called until a specific module is
- loaded. Keep a copy of the descriptor so it is available for
- later use.
-
- Signed-off-by: Michael Poole <mdpoole at troilus.org>
- Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
-
commit ea42416024fb33c970dbc10a6c69c0831126d75e
Author: Jiri Kosina <jkosina at suse.cz>
Date: Wed Feb 3 15:52:31 2010 +0100
@@ -276,99 +260,3 @@ index 6cf526d..280529a 100644
data, count))
return -ENOMEM;
return count;
-@@ -703,29 +714,9 @@ static void hidp_close(struct hid_device *hid)
- static int hidp_parse(struct hid_device *hid)
- {
- struct hidp_session *session = hid->driver_data;
-- struct hidp_connadd_req *req = session->req;
-- unsigned char *buf;
-- int ret;
--
-- buf = kmalloc(req->rd_size, GFP_KERNEL);
-- if (!buf)
-- return -ENOMEM;
--
-- if (copy_from_user(buf, req->rd_data, req->rd_size)) {
-- kfree(buf);
-- return -EFAULT;
-- }
--
-- ret = hid_parse_report(session->hid, buf, req->rd_size);
--
-- kfree(buf);
-
-- if (ret)
-- return ret;
--
-- session->req = NULL;
--
-- return 0;
-+ return hid_parse_report(session->hid, session->rd_data,
-+ session->rd_size);
- }
-
- static int hidp_start(struct hid_device *hid)
-@@ -770,12 +761,24 @@ static int hidp_setup_hid(struct hidp_session *session,
- bdaddr_t src, dst;
- int err;
-
-+ session->rd_data = kzalloc(req->rd_size, GFP_KERNEL);
-+ if (!session->rd_data)
-+ return -ENOMEM;
-+
-+ if (copy_from_user(session->rd_data, req->rd_data, req->rd_size)) {
-+ err = -EFAULT;
-+ goto fault;
-+ }
-+ session->rd_size = req->rd_size;
-+
- hid = hid_allocate_device();
-- if (IS_ERR(hid))
-- return PTR_ERR(hid);
-+ if (IS_ERR(hid)) {
-+ err = PTR_ERR(hid);
-+ goto fault;
-+ }
-
- session->hid = hid;
-- session->req = req;
-+
- hid->driver_data = session;
-
- baswap(&src, &bt_sk(session->ctrl_sock->sk)->src);
-@@ -806,6 +809,10 @@ failed:
- hid_destroy_device(hid);
- session->hid = NULL;
-
-+fault:
-+ kfree(session->rd_data);
-+ session->rd_data = NULL;
-+
- return err;
- }
-
-@@ -900,6 +907,9 @@ unlink:
- session->hid = NULL;
- }
-
-+ kfree(session->rd_data);
-+ session->rd_data = NULL;
-+
- purge:
- skb_queue_purge(&session->ctrl_transmit);
- skb_queue_purge(&session->intr_transmit);
-diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
-index faf3d74..a4e215d 100644
---- a/net/bluetooth/hidp/hidp.h
-+++ b/net/bluetooth/hidp/hidp.h
-@@ -154,7 +154,9 @@ struct hidp_session {
- struct sk_buff_head ctrl_transmit;
- struct sk_buff_head intr_transmit;
-
-- struct hidp_connadd_req *req;
-+ /* Report descriptor */
-+ __u8 *rd_data;
-+ uint rd_size;
- };
-
- static inline void hidp_schedule(struct hidp_session *session)
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -p -r1.1924 -r1.1925
--- kernel.spec 8 Feb 2010 15:07:39 -0000 1.1924
+++ kernel.spec 11 Feb 2010 06:38:20 -0000 1.1925
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 0
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -719,7 +719,6 @@ Patch12013: linux-2.6-rfkill-all.patch
Patch12015: add-appleir-usb-driver.patch
-Patch12016: fix-conntrack-bug-with-namespaces.patch
Patch12017: prevent-runtime-conntrack-changes.patch
Patch12018: neuter_intel_microcode_load.patch
@@ -1322,8 +1321,6 @@ ApplyPatch linux-2.6-rfkill-all.patch
ApplyPatch add-appleir-usb-driver.patch
-ApplyPatch fix-conntrack-bug-with-namespaces.patch
-
ApplyPatch neuter_intel_microcode_load.patch
# END OF PATCH APPLICATIONS
@@ -1977,6 +1974,12 @@ fi
# and build.
%changelog
+* Thu Feb 11 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.42.rc7.git5
+- 2.6.33-rc7-git5
+- Drop merged patches:
+ fix-conntrack-bug-with-namespaces.patch
+ commit ad60a9154887bb6162e427b0969fefd2f34e94a6 from git-bluetooth.patch
+
* Mon Feb 08 2010 Josh Boyer <jwboyer at gmail.com>
- Drop ppc ps3_storage and imac-transparent bridge patches
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -p -r1.1123 -r1.1124
--- sources 6 Feb 2010 23:14:41 -0000 1.1123
+++ sources 11 Feb 2010 06:38:20 -0000 1.1124
@@ -1,2 +1,3 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
9a65427747aeb1e9ae54aaf351af73a9 patch-2.6.33-rc7.bz2
+920d9fce5250c1d07c9ba14a484497d5 patch-2.6.33-rc7-git5.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1036
retrieving revision 1.1037
diff -u -p -r1.1036 -r1.1037
--- upstream 6 Feb 2010 23:14:41 -0000 1.1036
+++ upstream 11 Feb 2010 06:38:20 -0000 1.1037
@@ -1,2 +1,3 @@
linux-2.6.32.tar.bz2
patch-2.6.33-rc7.bz2
+patch-2.6.33-rc7-git5.bz2
--- fix-conntrack-bug-with-namespaces.patch DELETED ---
More information about the scm-commits
mailing list