From 0866ad0a88879ad92e6c487c7906331c447161da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Jan 2011 11:33:35 -0800 Subject: [PATCH] fixes for minor stuff --- ...the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch | 2 +- ..._lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch | 1 - queue-2.6.36/series | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch b/queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch index af52ee1790c..e558445ac86 100644 --- a/queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch +++ b/queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch @@ -6,7 +6,7 @@ Subject: econet: Do the correct cleanup after an unprivileged SIOCSIFADDR. From: Nelson Elhage -[ Upstream commit f24b8bedf70c524775eabd51570c3fa7708a97b7 ] +[ Upstream commit 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad] We need to drop the mutex and do a dev_put, so set an error code and break like the other paths, instead of returning directly. diff --git a/queue-2.6.36/mips-jz4740-qi_lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch b/queue-2.6.36/mips-jz4740-qi_lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch index 337b8339e74..761c3b0543b 100644 --- a/queue-2.6.36/mips-jz4740-qi_lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch +++ b/queue-2.6.36/mips-jz4740-qi_lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch @@ -13,7 +13,6 @@ This patch fixes the gpio number for the 6th row of the keyboard matrix. Signed-off-by: Lars-Peter Clausen Cc: linux-mips@linux-mips.org -Signed-off-by: https://patchwork.linux-mips.org/patch/1754/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.36/series b/queue-2.6.36/series index 95fc98b128f..efe14e42aca 100644 --- a/queue-2.6.36/series +++ b/queue-2.6.36/series @@ -146,4 +146,7 @@ block-deprecate-queue_flag_cluster-and-use-queue_limits-instead.patch x86-microcode-fix-double-vfree-and-remove-redundant-pointer-checks-before-vfree.patch posix-cpu-timers-workaround-to-suppress-the-problems-with-mt-exec.patch mx2_camera-fix-pixel-clock-polarity-configuration.patch +don-t-export-format_by_forcc-on-two-different-drivers.patch orinoco-initialise-priv-hw-before-assigning-the-interrupt.patch +gspca-sonixj-set-the-flag-for-some-devices.patch +gspca-sonixj-add-a-flag-in-the-driver_info-table.patch -- 2.47.3