48 files changed, 358 insertions, 195 deletions

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index a0f6842368c3..d3aae1f9b4c1 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -147,6 +147,11 @@ tcp_available_congestion_control - STRING
         More congestion control algorithms may be available as modules,
         but not loaded.
 
+tcp_base_mss - INTEGER
+        The initial value of search_low to be used by Packetization Layer
+        Path MTU Discovery (MTU probing).  If MTU probing is enabled,
+        this is the inital MSS used by the connection.
+
 tcp_congestion_control - STRING
         Set the congestion control algorithm to be used for new
         connections. The algorithm "reno" is always available, but
@@ -243,6 +248,27 @@ tcp_mem - vector of 3 INTEGERs: min, pressure, max
         Defaults are calculated at boot time from amount of available
         memory.
 
+tcp_moderate_rcvbuf - BOOLEAN
+        If set, TCP performs receive buffer autotuning, attempting to
+        automatically size the buffer (no greater than tcp_rmem[2]) to
+        match the size required by the path for full throughput.  Enabled by
+        default.
+
+tcp_mtu_probing - INTEGER
+        Controls TCP Packetization-Layer Path MTU Discovery.  Takes three
+        values:
+          0 - Disabled
+          1 - Disabled by default, enabled when an ICMP black hole detected
+          2 - Always enabled, use initial MSS of tcp_base_mss.
+
+tcp_no_metrics_save - BOOLEAN
+        By default, TCP saves various connection metrics in the route cache
+        when the connection closes, so that connections established in the
+        near future can use these to set initial conditions.  Usually, this
+        increases overall performance, but may sometimes cause performance
+        degredation.  If set, TCP will not cache metrics on closing
+        connections.
+
 tcp_orphan_retries - INTEGER
         How may times to retry before killing TCP connection, closed
         by our side. Default value 7 corresponds to ~50sec-16min
diff --git a/MAINTAINERS b/MAINTAINERS
index 480ccb9d6cc9..1dfba85ca7b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1492,6 +1492,7 @@ HID CORE LAYER
 P:      Jiri Kosina
 M:      jkosina@suse.cz
 L:      linux-input@atrey.karlin.mff.cuni.cz
+T:      git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
 S:      Maintained
 
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
@@ -3423,6 +3424,7 @@ USB HID/HIDBP DRIVERS
 P:      Jiri Kosina
 M:      jkosina@suse.cz
 L:      linux-usb-devel@lists.sourceforge.net
+T:      git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
 S:      Maintained
 
 USB HUB DRIVER
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 59eef403c60a..860b8b60526c 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc1
-# Mon Feb 26 10:45:21 2007
+# Linux kernel version: 2.6.21-rc2
+# Wed Feb 28 09:50:51 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -1219,6 +1219,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 
 #
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 7452399501b4..f4ee1afe488f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -667,7 +667,6 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
 
                 if (item.format != HID_ITEM_FORMAT_SHORT) {
                         dbg("unexpected long global item");
-                        kfree(device->collection);
                         hid_free_device(device);
                         kfree(parser);
                         return NULL;
@@ -676,7 +675,6 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
                 if (dispatch_type[item.type](parser, &item)) {
                         dbg("item %u %u %u %u parsing failed\n",
                                 item.format, (unsigned)item.size, (unsigned)item.type, (unsigned)item.tag);
-                        kfree(device->collection);
                         hid_free_device(device);
                         kfree(parser);
                         return NULL;
@@ -685,14 +683,12 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
                 if (start == end) {
                         if (parser->collection_stack_ptr) {
                                 dbg("unbalanced collection at end of report description");
-                                kfree(device->collection);
                                 hid_free_device(device);
                                 kfree(parser);
                                 return NULL;
                         }
                         if (parser->local.delimiter_depth) {
                                 dbg("unbalanced delimiter at end of report description");
-                                kfree(device->collection);
                                 hid_free_device(device);
                                 kfree(parser);
                                 return NULL;
@@ -703,7 +699,6 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
         }
 
         dbg("item fetching failed at offset %d\n", (int)(end - start));
-        kfree(device->collection);
         hid_free_device(device);
         kfree(parser);
         return NULL;
@@ -880,7 +875,7 @@ static void hid_output_field(struct hid_field *field, __u8 *data)
 
         /* make sure the unused bits in the last byte are zeros */
         if (count > 0 && size > 0)
-                data[(count*size-1)/8] = 0;
+                data[(offset+count*size-1)/8] = 0;
 
         for (n = 0; n < count; n++) {
                 if (field->logical_minimum < 0) /* signed values */
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 89241be4ec9b..83c4126b37c3 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -29,6 +29,7 @@
  */
 
 #include <linux/hid.h>
+#include <linux/hid-debug.h>
 
 struct hid_usage_entry {
         unsigned  page;
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 25d180a24fc4..c8434023ba65 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -2,7 +2,7 @@
  * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $
  *
  *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  *
  *  HID to Linux Input mapping
  */
@@ -71,7 +71,6 @@ static const struct {
 #define map_led(c)      do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0)
 
 #define map_abs_clear(c)        do { map_abs(c); clear_bit(c, bit); } while (0)
-#define map_rel_clear(c)        do { map_rel(c); clear_bit(c, bit); } while (0)
 #define map_key_clear(c)        do { map_key(c); clear_bit(c, bit); } while (0)
 
 #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
@@ -296,7 +295,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                         }
                         }
 
-                        map_key_clear(code);
+                        map_key(code);
                         break;
 
 
@@ -347,9 +346,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
                                 case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
                                         if (field->flags & HID_MAIN_ITEM_RELATIVE)
-                                                map_rel_clear(usage->hid & 0xf);
+                                                map_rel(usage->hid & 0xf);
                                         else
-                                                map_abs_clear(usage->hid & 0xf);
+                                                map_abs(usage->hid & 0xf);
                                         break;
 
                                 case HID_GD_HATSWITCH:
@@ -519,7 +518,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
                                 case 0x233: map_key_clear(KEY_SCROLLUP);        break;
                                 case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
-                                case 0x238: map_rel_clear(REL_HWHEEL);          break;
+                                case 0x238: map_rel(REL_HWHEEL);                break;
                                 case 0x25f: map_key_clear(KEY_CANCEL);          break;
                                 case 0x279: map_key_clear(KEY_REDO);            break;
 
@@ -532,6 +531,26 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x302: map_key_clear(KEY_PROG2);           break;
                                 case 0x303: map_key_clear(KEY_PROG3);           break;
 
+                                /* Reported on Logitech S510 wireless keyboard */
+                                case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
+                                case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
+                                case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
+                                /* this one is marked as 'Rotate' */
+                                case 0x1028: map_key_clear(KEY_ANGLE);          break;
+                                case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
+                                case 0x1041: map_key_clear(KEY_BATTERY);        break;
+                                case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
+                                case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
+                                case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
+                                case 0x1045: map_key_clear(KEY_UNDO);           break;
+                                case 0x1046: map_key_clear(KEY_REDO);           break;
+                                case 0x1047: map_key_clear(KEY_PRINT);          break;
+                                case 0x1048: map_key_clear(KEY_SAVE);           break;
+                                case 0x1049: map_key_clear(KEY_PROG1);          break;
+                                case 0x104a: map_key_clear(KEY_PROG2);          break;
+                                case 0x104b: map_key_clear(KEY_PROG3);          break;
+                                case 0x104c: map_key_clear(KEY_PROG4);          break;
+
                                 default:    goto ignore;
                         }
                         break;
@@ -647,6 +666,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
         set_bit(usage->type, input->evbit);
 
+        if (device->quirks & HID_QUIRK_DUPLICATE_USAGES &&
+                        (usage->type == EV_KEY ||
+                         usage->type == EV_REL ||
+                         usage->type == EV_ABS))
+                clear_bit(usage->code, bit);
+
         while (usage->code <= max && test_and_set_bit(usage->code, bit))
                 usage->code = find_next_zero_bit(bit, max + 1, usage->code);
 
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 15d12fce34df..127a94b9a1b5 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -469,9 +469,9 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev,
             fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {
 
                 fw->data[BLUEBIRD_01_ID_OFFSET + 2] =
-                        udev->descriptor.idProduct + 1;
+                        le16_to_cpu(udev->descriptor.idProduct) + 1;
                 fw->data[BLUEBIRD_01_ID_OFFSET + 3] =
-                        udev->descriptor.idProduct >> 8;
+                        le16_to_cpu(udev->descriptor.idProduct) >> 8;
 
                 return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
         }
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 4a198d4755b0..b5acb11c0bc9 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -119,6 +119,8 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
         struct dvb_usb_adapter *adap = fe->dvb->priv;
         u8 b[5];
         dvb_usb_tuner_calc_regs(fe,fep,b, 5);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
 }
 
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 682dc7ce48d9..710c11a68296 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1022,7 +1022,7 @@ static ssize_t cafe_v4l_read(struct file *filp,
                 char __user *buffer, size_t len, loff_t *pos)
 {
         struct cafe_camera *cam = filp->private_data;
-        int ret;
+        int ret = 0;
 
         /*
          * Perhaps we're in speculative read mode and already
@@ -1251,8 +1251,6 @@ static int cafe_vidioc_reqbufs(struct file *filp, void *priv,
 
         if (cam->n_sbufs == 0)  /* no luck at all - ret already set */
                 kfree(cam->sb_bufs);
-        else
-                ret = 0;
         req->count = cam->n_sbufs;  /* In case of partial success */
 
   out:
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index cc535ca713d2..774d2536555b 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -633,7 +633,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_CX25840)
+                if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
@@ -903,13 +903,13 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
         state->vbi_line_offset = 8;
         state->id = id;
 
+        i2c_attach_client(client);
+
         if (state->is_cx25836)
                 cx25836_initialize(client);
         else
                 cx25840_initialize(client, 1);
 
-        i2c_attach_client(client);
-
         return 0;
 }
 
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 1958d4016ea1..0e86b9d033ac 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -37,7 +37,7 @@
  */
 #define FWSEND 48
 
-#define FWDEV(x) &((x)->adapter->dev)
+#define FWDEV(x) &((x)->dev)
 
 static char *firmware = FWFILE;
 
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index a97be1bdc31d..bdfe2af70124 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1389,7 +1389,7 @@ static int vidioc_g_register (struct file *file, void *fh,
 {
         struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
 
-        if (reg->i2c_id != 0)
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                 return -EINVAL;
         /* cx2388x has a 24-bit register space */
         reg->val = cx_read(reg->reg&0xffffff);
@@ -1401,7 +1401,7 @@ static int vidioc_s_register (struct file *file, void *fh,
 {
         struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
 
-        if (reg->i2c_id != 0)
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                 return -EINVAL;
         cx_write(reg->reg&0xffffff, reg->val);
         return 0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index a1ca0f5007e0..1cd4bb3ae260 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3256,8 +3256,8 @@ static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)
 
 
 int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
-                             u32 chip_id, u64 reg_id,
-                             int setFl,u32 *val_ptr)
+                             u32 match_type, u32 match_chip, u64 reg_id,
+                             int setFl,u64 *val_ptr)
 {
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         struct list_head *item;
@@ -3268,13 +3268,16 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
 
         if (!capable(CAP_SYS_ADMIN)) return -EPERM;
 
-        req.i2c_id = chip_id;
+        req.match_type = match_type;
+        req.match_chip = match_chip;
         req.reg = reg_id;
         if (setFl) req.val = *val_ptr;
         mutex_lock(&hdw->i2c_list_lock); do {
                 list_for_each(item,&hdw->i2c_clients) {
                         cp = list_entry(item,struct pvr2_i2c_client,list);
-                        if (cp->client->driver->id != chip_id) continue;
+                        if (!v4l2_chip_match_i2c_client(cp->client, req.match_type, req.match_chip)) {
+                                continue;
+                        }
                         stat = pvr2_i2c_client_cmd(
                                 cp,(setFl ? VIDIOC_DBG_S_REGISTER :
                                     VIDIOC_DBG_G_REGISTER),&req);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 566a8ef7e121..0c9cca43ff85 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -217,13 +217,14 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,
                                      enum pvr2_v4l_type index,int);
 
 /* Direct read/write access to chip's registers:
-   chip_id - unique id of chip (e.g. I2C_DRIVERD_xxxx)
+   match_type - how to interpret match_chip (e.g. driver ID, i2c address)
+   match_chip - chip match value (e.g. I2C_DRIVERD_xxxx)
    reg_id  - register number to access
    setFl   - true to set the register, false to read it
    val_ptr - storage location for source / result. */
 int pvr2_hdw_register_access(struct pvr2_hdw *,
-                             u32 chip_id,u64 reg_id,
-                             int setFl,u32 *val_ptr);
+                             u32 match_type, u32 match_chip,u64 reg_id,
+                             int setFl,u64 *val_ptr);
 
 /* The following entry points are all lower level things you normally don't
    want to worry about. */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 4fe4136204c7..5313d342666e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -740,11 +740,11 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_DBG_S_REGISTER:
         case VIDIOC_DBG_G_REGISTER:
         {
-                u32 val;
+                u64 val;
                 struct v4l2_register *req = (struct v4l2_register *)arg;
                 if (cmd == VIDIOC_DBG_S_REGISTER) val = req->val;
                 ret = pvr2_hdw_register_access(
-                        hdw,req->i2c_id,req->reg,
+                        hdw,req->match_type,req->match_chip,req->reg,
                         cmd == VIDIOC_DBG_S_REGISTER,&val);
                 if (cmd == VIDIOC_DBG_G_REGISTER) req->val = val;
                 break;
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index c4f066d6668e..7735b6758921 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1425,7 +1425,7 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_SAA711X)
+                if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index bd9c4f3ad02e..654863db1591 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -619,7 +619,7 @@ static int saa7127_command(struct i2c_client *client,
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_SAA7127)
+                if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 886b5df7c9d1..d5ec05f56adf 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -955,7 +955,7 @@ static int tvp5150_command(struct i2c_client *c,
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_TVP5150)
+                if (!v4l2_chip_match_i2c_client(c, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index b3b5fd536dc3..28d1133a3b7a 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -167,7 +167,7 @@ static int upd64031a_command(struct i2c_client *client, unsigned int cmd, void *
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_UPD64031A)
+                if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 8852903e7a92..fe38224150d8 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -144,7 +144,7 @@ static int upd64083_command(struct i2c_client *client, unsigned int cmd, void *a
         {
                 struct v4l2_register *reg = arg;
 
-                if (reg->i2c_id != I2C_DRIVERID_UPD64083)
+                if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index ae5f42562c0c..6fc14557d623 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -521,7 +521,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         struct v4l2_register *reg = arg;
                         int errCode;
 
-                        if (reg->i2c_id != 0)
+                        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                                 return -EINVAL;
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EPERM;
@@ -540,7 +540,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
                         PDEBUG(DBG_IOCTL, "VIDIOC_DBG_%c_REGISTER reg=0x%02X, value=0x%02X",
                                cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S',
-                               (unsigned int)reg->reg, reg->val);
+                               (unsigned int)reg->reg, (unsigned int)reg->val);
                         return 0;
                 }
 #endif
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index ddfd80c5618b..54747606eae1 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -51,6 +51,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+#include <linux/i2c.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -365,13 +366,21 @@ static const char *v4l2_ioctls[] = {
         [_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",
         [_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",
         [_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",
-#if 1
         [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",
-#endif
         [_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",
         [_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",
         [_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",
-        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS"
+        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",
+#if 1
+        [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
+        [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
+        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
+        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
+        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD",
+
+        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]   = "VIDIOC_DBG_S_REGISTER",
+        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]   = "VIDIOC_DBG_G_REGISTER",
+#endif
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
 
@@ -395,9 +404,6 @@ static const char *v4l2_int_ioctls[] = {
         [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
         [_IOC_NR(TDA9887_SET_CONFIG)]          = "TDA9887_SET_CONFIG",
 
-        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]       = "VIDIOC_DBG_S_REGISTER",
-        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]       = "VIDIOC_DBG_G_REGISTER",
-
         [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
         [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
         [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
@@ -947,6 +953,28 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
         return **ctrl_classes;
 }
 
+int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_chip)
+{
+        switch (match_type) {
+        case V4L2_CHIP_MATCH_I2C_DRIVER:
+                return (c != NULL && c->driver != NULL && c->driver->id == match_chip);
+        case V4L2_CHIP_MATCH_I2C_ADDR:
+                return (c != NULL && c->addr == match_chip);
+        default:
+                return 0;
+        }
+}
+
+int v4l2_chip_match_host(u32 match_type, u32 match_chip)
+{
+        switch (match_type) {
+        case V4L2_CHIP_MATCH_HOST:
+                return match_chip == 0;
+        default:
+                return 0;
+        }
+}
+
 /* ----------------------------------------------------------------- */
 
 EXPORT_SYMBOL(v4l2_norm_to_name);
@@ -970,6 +998,9 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 EXPORT_SYMBOL(v4l2_ctrl_query_fill);
 EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
 
+EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
+EXPORT_SYMBOL(v4l2_chip_match_host);
+
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index dc9b1ef678aa..011938fb7e0e 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1342,6 +1342,42 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                         ret=vfd->vidioc_s_jpegcomp(file, fh, p);
                 break;
         }
+        case VIDIOC_G_ENC_INDEX:
+        {
+                struct v4l2_enc_idx *p=arg;
+
+                if (!vfd->vidioc_g_enc_index)
+                        break;
+                ret=vfd->vidioc_g_enc_index(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "entries=%d, entries_cap=%d\n",
+                                        p->entries,p->entries_cap);
+                break;
+        }
+        case VIDIOC_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p=arg;
+
+                if (!vfd->vidioc_encoder_cmd)
+                        break;
+                ret=vfd->vidioc_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "cmd=%d, flags=%d\n",
+                                        p->cmd,p->flags);
+                break;
+        }
+        case VIDIOC_TRY_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p=arg;
+
+                if (!vfd->vidioc_try_encoder_cmd)
+                        break;
+                ret=vfd->vidioc_try_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "cmd=%d, flags=%d\n",
+                                        p->cmd,p->flags);
+                break;
+        }
         case VIDIOC_G_PARM:
         {
                 struct v4l2_streamparm *p=arg;
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index ef09952f2039..12ec8b432953 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  */
 
 /*
@@ -27,9 +27,6 @@
 #include <linux/input.h>
 #include <linux/wait.h>
 
-#undef DEBUG
-#undef DEBUG_DATA
-
 #include <linux/usb.h>
 
 #include <linux/hid.h>
@@ -758,6 +755,8 @@ void usbhid_init_reports(struct hid_device *hid)
 
 #define USB_VENDOR_ID_LOGITECH          0x046d
 #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER     0xc101
+#define USB_DEVICE_ID_LOGITECH_USB_RECEIVER_2   0xc517
+#define USB_DEVICE_ID_DINOVO_EDGE       0xc714
 
 #define USB_VENDOR_ID_IMATION           0x0718
 #define USB_DEVICE_ID_DISC_STAKKA       0xd000
@@ -778,6 +777,8 @@ static const struct hid_blacklist {
         unsigned quirks;
 } hid_blacklist[] = {
 
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },
+
         { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20, HID_QUIRK_IGNORE },
@@ -944,6 +945,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
 
         { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_USB_RECEIVER, HID_QUIRK_BAD_RELATIVE_KEYS },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_USB_RECEIVER_2, HID_QUIRK_LOGITECH_S510_DESCRIPTOR },
 
         { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
 
@@ -1041,6 +1043,22 @@ static void hid_fixup_sony_ps3_controller(struct usb_device *dev, int ifnum)
         kfree(buf);
 }
 
+/*
+ * Logitech S510 keyboard sends in report #3 keys which are far
+ * above the logical maximum described in descriptor. This extends
+ * the original value of 0x28c of logical maximum to 0x104d
+ */
+static void hid_fixup_s510_descriptor(unsigned char *rdesc, int rsize)
+{
+        if (rsize >= 90 && rdesc[83] == 0x26
+                        && rdesc[84] == 0x8c
+                        && rdesc[85] == 0x02) {
+                info("Fixing up Logitech S510 report descriptor");
+                rdesc[84] = rdesc[89] = 0x4d;
+                rdesc[85] = rdesc[90] = 0x10;
+        }
+}
+
 static struct hid_device *usb_hid_configure(struct usb_interface *intf)
 {
         struct usb_host_interface *interface = intf->cur_altsetting;
@@ -1109,7 +1127,10 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         if ((quirks & HID_QUIRK_CYMOTION))
                 hid_fixup_cymotion_descriptor(rdesc, rsize);
 
-#ifdef DEBUG_DATA
+        if (quirks & HID_QUIRK_LOGITECH_S510_DESCRIPTOR)
+                hid_fixup_s510_descriptor(rdesc, rsize);
+
+#ifdef CONFIG_HID_DEBUG
         printk(KERN_DEBUG __FILE__ ": report descriptor (size %u, read %d) = ", rsize, n);
         for (n = 0; n < rsize; n++)
                 printk(" %02x", (unsigned char) rdesc[n]);
@@ -1225,8 +1246,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                          le16_to_cpu(dev->descriptor.idProduct));
 
         hid->bus = BUS_USB;
-        hid->vendor = dev->descriptor.idVendor;
-        hid->product = dev->descriptor.idProduct;
+        hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
+        hid->product = le16_to_cpu(dev->descriptor.idProduct);
 
         usb_make_path(dev, hid->phys, sizeof(hid->phys));
         strlcat(hid->phys, "/input", sizeof(hid->phys));
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h
index 93e5a062df88..1bf4f7a8fbe1 100644
--- a/include/asm-sparc64/dma.h
+++ b/include/asm-sparc64/dma.h
@@ -205,10 +205,6 @@ do {	u32 tmp = sbus_readl((__regs) + DMA_CSR); \
 #define for_each_dvma(dma) \
         for((dma) = dma_chain; (dma); (dma) = (dma)->next)
 
-extern int get_dma_list(char *);
-extern int request_dma(unsigned int, __const__ char *);
-extern void free_dma(unsigned int);
-
 /* From PCI */
 
 #ifdef CONFIG_PCI
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index d3895873e4c7..be9509c8f8c1 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -23,8 +23,30 @@ static struct sparc_ebus_info {
         struct ebus_dma_info info;
         unsigned int addr;
         unsigned int count;
+        int lock;
 } sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
 
+static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
+{
+        if (dmanr >= PARPORT_PC_MAX_PORTS)
+                return -EINVAL;
+        if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
+                return -EBUSY;
+        return 0;
+}
+
+static __inline__ void free_dma(unsigned int dmanr)
+{
+        if (dmanr >= PARPORT_PC_MAX_PORTS) {
+                printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
+                return;
+        }
+        if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
+                printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
+                return;
+        }       
+}
+
 static __inline__ void enable_dma(unsigned int dmanr)
 {
         ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
diff --git a/include/linux/hid.h b/include/linux/hid.h
index d26b08f461f2..8c97d4d3fdb0 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -6,7 +6,7 @@
  *
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  */
 
 /*
@@ -267,6 +267,8 @@ struct hid_item {
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00020000
 #define HID_QUIRK_IGNORE_MOUSE                  0x00040000
 #define HID_QUIRK_SONY_PS3_CONTROLLER           0x00080000
+#define HID_QUIRK_LOGITECH_S510_DESCRIPTOR      0x00100000
+#define HID_QUIRK_DUPLICATE_USAGES              0x00200000
 
 /*
  * This is the global environment of the parser. This information is
@@ -292,7 +294,7 @@ struct hid_global {
  */
 
 #define HID_MAX_DESCRIPTOR_SIZE         4096
-#define HID_MAX_USAGES                  1024
+#define HID_MAX_USAGES                  8192
 #define HID_DEFAULT_NUM_COLLECTIONS     16
 
 struct hid_local {
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index a60995afe334..3f3e7a648da3 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -4,6 +4,7 @@
 #ifdef CONFIG_HUGETLB_PAGE
 
 #include <linux/mempolicy.h>
+#include <linux/shm.h>
 #include <asm/tlbflush.h>
 
 struct ctl_table;
@@ -168,7 +169,12 @@ void hugetlb_put_quota(struct address_space *mapping);
 
 static inline int is_file_hugepages(struct file *file)
 {
-        return file->f_op == &hugetlbfs_file_operations;
+        if (file->f_op == &hugetlbfs_file_operations)
+                return 1;
+        if (is_file_shm_hugepages(file))
+                return 1;
+
+        return 0;
 }
 
 static inline void set_file_hugepages(struct file *file)
diff --git a/include/linux/shm.h b/include/linux/shm.h
index a2c896ad0bef..ad2e3af65997 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -96,12 +96,17 @@ struct shmid_kernel /* private to the kernel */
 
 #ifdef CONFIG_SYSVIPC
 long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
+extern int is_file_shm_hugepages(struct file *file);
 #else
 static inline long do_shmat(int shmid, char __user *shmaddr,
                                 int shmflg, unsigned long *addr)
 {
         return -ENOSYS;
 }
+static inline int is_file_shm_hugepages(struct file *file)
+{
+        return 0;
+}
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 28157a36e6cc..fcd35a210e7f 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage {
                                 /* _SS_MAXSIZE value minus size of ss_family */
 } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));   /* force desired alignment */
 
-#ifdef __KERNEL__
+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
 
 #include <asm/socket.h>                 /* arch-dependent defines       */
 #include <linux/sockios.h>              /* the SIOCxxx I/O controls     */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 4f8539ccff6c..679ef0d70b6b 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -7,7 +7,7 @@
 
 #endif
 
-#ifdef __KERNEL__
+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
 
 #define S_IFMT  00170000
 #define S_IFSOCK 0140000
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 21805b500aa2..523405e1e1f6 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -211,9 +211,8 @@ static inline int sysfs_add_file_to_group(struct kobject *kobj,
 }
 
 static inline void sysfs_remove_file_from_group(struct kobject *kobj,
-                const struct attribute *attr, const char *group);
+                const struct attribute *attr, const char *group)
 {
-        ;
 }
 
 static inline void sysfs_notify(struct kobject * k, char *dir, char *attr)
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 65a165f918c9..441b877bf150 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1193,6 +1193,55 @@ struct v4l2_audioout
 };
 
 /*
+ *      M P E G   S E R V I C E S
+ *
+ *      NOTE: EXPERIMENTAL API
+ */
+#if 1
+#define V4L2_ENC_IDX_FRAME_I    (0)
+#define V4L2_ENC_IDX_FRAME_P    (1)
+#define V4L2_ENC_IDX_FRAME_B    (2)
+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
+
+struct v4l2_enc_idx_entry {
+        __u64 offset;
+        __u64 pts;
+        __u32 length;
+        __u32 flags;
+        __u32 reserved[2];
+};
+
+#define V4L2_ENC_IDX_ENTRIES (64)
+struct v4l2_enc_idx {
+        __u32 entries;
+        __u32 entries_cap;
+        __u32 reserved[4];
+        struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
+};
+
+
+#define V4L2_ENC_CMD_START      (0)
+#define V4L2_ENC_CMD_STOP       (1)
+#define V4L2_ENC_CMD_PAUSE      (2)
+#define V4L2_ENC_CMD_RESUME     (3)
+
+/* Flags for V4L2_ENC_CMD_STOP */
+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
+
+struct v4l2_encoder_cmd {
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u32 data[8];
+                } raw;
+        };
+};
+
+#endif
+
+
+/*
  *      D A T A   S E R V I C E S   ( V B I )
  *
  *      Data services API by Michael Schimek
@@ -1303,13 +1352,21 @@ struct v4l2_streamparm
 
 /*
  *      A D V A N C E D   D E B U G G I N G
+ *
+ *      NOTE: EXPERIMENTAL API
  */
 
 /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
+
+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver ID */
+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
+
 struct v4l2_register {
+        __u32 match_type; /* Match type */
+        __u32 match_chip; /* Match this chip, meaning determined by match_type */
         __u64 reg;
-        __u32 i2c_id; /* I2C driver ID of the I2C chip, or 0 for the host */
-        __u32 val;
+        __u64 val;
 };
 
 /*
@@ -1378,10 +1435,14 @@ struct v4l2_register {
 #if 1
 #define VIDIOC_ENUM_FRAMESIZES  _IOWR ('V', 74, struct v4l2_frmsizeenum)
 #define VIDIOC_ENUM_FRAMEINTERVALS      _IOWR ('V', 75, struct v4l2_frmivalenum)
+#define VIDIOC_G_ENC_INDEX      _IOR  ('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD      _IOWR ('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR ('V', 78, struct v4l2_encoder_cmd)
+
+/* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
+#define VIDIOC_DBG_S_REGISTER   _IOW  ('V', 79, struct v4l2_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR ('V', 80, struct v4l2_register)
 #endif
-/* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
-#define VIDIOC_DBG_S_REGISTER   _IOW ('d', 100, struct v4l2_register)
-#define VIDIOC_DBG_G_REGISTER   _IOWR('d', 101, struct v4l2_register)
 
 #ifdef __OLD_VIDIOC_
 /* for compatibility, will go away some day */
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 244e440edb53..6eaeec98ed89 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -94,6 +94,14 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 
 /* ------------------------------------------------------------------------- */
 
+/* Register/chip ident helper function */
+
+struct i2c_client; /* forward reference */
+int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 id_type, u32 chip_id);
+int v4l2_chip_match_host(u32 id_type, u32 chip_id);
+
+/* ------------------------------------------------------------------------- */
+
 /* Internal ioctls */
 
 /* VIDIOC_INT_DECODE_VBI_LINE */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index aeec56992ef5..1dd3d3239ecf 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -271,6 +271,12 @@ struct video_device
                                         struct v4l2_jpegcompression *a);
         int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,
                                         struct v4l2_jpegcompression *a);
+        int (*vidioc_g_enc_index)      (struct file *file, void *fh,
+                                        struct v4l2_enc_idx *a);
+        int (*vidioc_encoder_cmd)      (struct file *file, void *fh,
+                                        struct v4l2_encoder_cmd *a);
+        int (*vidioc_try_encoder_cmd)  (struct file *file, void *fh,
+                                        struct v4l2_encoder_cmd *a);
 
         /* Stream type-dependent parameter ioctls */
         int (*vidioc_g_parm)           (struct file *file, void *fh,
diff --git a/include/net/sock.h b/include/net/sock.h
index 03684e702d13..2c7d60ca3548 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1278,7 +1278,7 @@ static inline int sock_writeable(const struct sock *sk)
 
 static inline gfp_t gfp_any(void)
 {
-        return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
+        return in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
 }
 
 static inline long sock_rcvtimeo(const struct sock *sk, int noblock)
diff --git a/ipc/shm.c b/ipc/shm.c
index 3d0eb7940e9c..4fefbad7096d 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -285,21 +285,41 @@ static int shm_release(struct inode *ino, struct file *file)
         return 0;
 }
 
-#ifndef CONFIG_MMU
+static int shm_fsync(struct file *file, struct dentry *dentry, int datasync)
+{
+        int (*fsync) (struct file *, struct dentry *, int datasync);
+        struct shm_file_data *sfd = shm_file_data(file);
+        int ret = -EINVAL;
+
+        fsync = sfd->file->f_op->fsync;
+        if (fsync)
+                ret = fsync(sfd->file, sfd->file->f_path.dentry, datasync);
+        return ret;
+}
+
 static unsigned long shm_get_unmapped_area(struct file *file,
         unsigned long addr, unsigned long len, unsigned long pgoff,
         unsigned long flags)
 {
         struct shm_file_data *sfd = shm_file_data(file);
-        return sfd->file->f_op->get_unmapped_area(sfd->file, addr, len, pgoff,
-                                                        flags);
+        return get_unmapped_area(sfd->file, addr, len, pgoff, flags);
+}
+
+int is_file_shm_hugepages(struct file *file)
+{
+        int ret = 0;
+
+        if (file->f_op == &shm_file_operations) {
+                struct shm_file_data *sfd;
+                sfd = shm_file_data(file);
+                ret = is_file_hugepages(sfd->file);
+        }
+        return ret;
 }
-#else
-#define shm_get_unmapped_area NULL
-#endif
 
 static const struct file_operations shm_file_operations = {
         .mmap           = shm_mmap,
+        .fsync          = shm_fsync,
         .release        = shm_release,
         .get_unmapped_area      = shm_get_unmapped_area,
 };
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 3ab153d3c508..147015fe5c75 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -291,12 +291,11 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
-                spin_lock_bh(&br->lock);
                 if ((p = br_get_port(br, args[1])) == NULL)
                         ret = -EINVAL;
                 else
                         br_stp_set_path_cost(p, args[2]);
-                spin_unlock_bh(&br->lock);
+
                 return ret;
         }
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f89ff151cfab..820761f9eeef 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2037,7 +2037,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 err:
         while ((skb = segs)) {
                 segs = skb->next;
-                kfree(skb);
+                kfree_skb(skb);
         }
         return ERR_PTR(err);
 }
diff --git a/net/dccp/output.c b/net/dccp/output.c
index f5c6aca1dfa4..3282f2f2291b 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -269,7 +269,7 @@ void dccp_write_xmit(struct sock *sk, int block)
                                          err);
                 } else {
                         dccp_pr_debug("packet discarded\n");
-                        kfree(skb);
+                        kfree_skb(skb);
                 }
         }
 }
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 30b1e520ad94..6b5c64f3c925 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -381,7 +381,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
         if (newsk != NULL) {
                 const struct inet_request_sock *ireq = inet_rsk(req);
                 struct tcp_request_sock *treq = tcp_rsk(req);
-                struct inet_connection_sock *newicsk = inet_csk(sk);
+                struct inet_connection_sock *newicsk = inet_csk(newsk);
                 struct tcp_sock *newtp;
 
                 /* Now setup tcp_sock */
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index f6ac65d36559..e16f1bba5dff 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -400,6 +400,8 @@ static void dev_forward_change(struct inet6_dev *idev)
                         ipv6_dev_mc_dec(dev, &addr);
         }
         for (ifa=idev->addr_list; ifa; ifa=ifa->if_next) {
+                if (ifa->flags&IFA_F_TENTATIVE)
+                        continue;
                 if (idev->cnf.forwarding)
                         addrconf_join_anycast(ifa);
                 else
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index e5ef5979ade4..09117d63256f 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -461,6 +461,7 @@ static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)
                         break;
                 }
                 read_unlock_bh(&idev->lock);
+                in6_dev_put(idev);
         }
         return im;
 }
diff --git a/net/ipx/ChangeLog b/net/ipx/ChangeLog
deleted file mode 100644
index 3b29763751a3..000000000000
--- a/net/ipx/ChangeLog
+++ /dev/null
@@ -1,101 +0,0 @@
- Revision 0.21: Uses the new generic socket option code.
-
- Revision 0.22: Gcc clean ups and drop out device registration. Use the
-                new multi-protocol edition of hard_header
-
- Revision 0.23: IPX /proc by Mark Evans. Adding a route will
-                will overwrite any existing route to the same network.
-
- Revision 0.24: Supports new /proc with no 4K limit
-
- Revision 0.25: Add ephemeral sockets, passive local network
-                identification, support for local net 0 and
-                multiple datalinks <Greg Page>
-
- Revision 0.26: Device drop kills IPX routes via it. (needed for module)
-
- Revision 0.27: Autobind <Mark Evans>
-
- Revision 0.28: Small fix for multiple local networks <Thomas Winder>
-
- Revision 0.29: Assorted major errors removed <Mark Evans>
-                Small correction to promisc mode error fix <Alan Cox>
-                Asynchronous I/O support. Changed to use notifiers
-                and the newer packet_type stuff. Assorted major
-                fixes <Alejandro Liu>
-
- Revision 0.30: Moved to net/ipx/...    <Alan Cox>
-                Don't set address length on recvfrom that errors.
-                Incorrect verify_area.
-
- Revision 0.31: New sk_buffs. This still needs a lot of 
-                testing. <Alan Cox>
-
- Revision 0.32: Using sock_alloc_send_skb, firewall hooks. <Alan Cox>
-                Supports sendmsg/recvmsg
-
- Revision 0.33: Internal network support, routing changes, uses a
-                protocol private area for ipx data.
-
- Revision 0.34: Module support. <Jim Freeman>
-
- Revision 0.35: Checksum support. <Neil Turton>, hooked in by <Alan Cox>
-                Handles WIN95 discovery packets <Volker Lendecke>
-
- Revision 0.36: Internal bump up for 2.1
-
- Revision 0.37: Began adding POSIXisms.
-
- Revision 0.38: Asynchronous socket stuff made current.
-
- Revision 0.39: SPX interfaces
-
- Revision 0.40: Tiny SIOCGSTAMP fix (chris@cybernet.co.nz)
-
- Revision 0.41: 802.2TR removed (p.norton@computer.org)
-                Fixed connecting to primary net,
-                Automatic binding on send & receive,
-                Martijn van Oosterhout <kleptogimp@geocities.com>
-
- Revision 042:  Multithreading - use spinlocks and refcounting to
-                protect some structures: ipx_interface sock list, list
-                of ipx interfaces, etc. 
-                Bugfixes - do refcounting on net_devices, check function
-                results, etc. Thanks to davem and freitag for
-                suggestions and guidance.
-                Arnaldo Carvalho de Melo <acme@conectiva.com.br>,
-                November, 2000
-
- Revision 043:  Shared SKBs, don't mangle packets, some cleanups
-                Arnaldo Carvalho de Melo <acme@conectiva.com.br>,
-                December, 2000
-
- Revision 044:  Call ipxitf_hold on NETDEV_UP - acme
-
- Revision 045:  fix PPROP routing bug - acme
-
- Revision 046:  Further fixes to PPROP, ipxitf_create_internal was
-                doing an unneeded MOD_INC_USE_COUNT, implement
-                sysctl for ipx_pprop_broacasting, fix the ipx sysctl
-                handling, making it dynamic, some cleanups, thanks to
-                Petr Vandrovec for review and good suggestions. (acme)
-
- Revision 047:  Cleanups, CodingStyle changes, move the ncp connection
-                hack out of line - acme
-
- Revision 048:  Use sk->protinfo to store the pointer to IPX private
-                area, remove af_ipx from sk->protinfo and move ipx_opt
-                to include/net/ipx.h, use IPX_SK like DecNET, etc - acme
-
- Revision 049:  SPX support dropped, see comment in ipx_create - acme
-
- Revision 050:  Use seq_file for proc stuff, moving it to ipx_proc.c - acme
-
-Other fixes:
- 
- Protect the module by a MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT pair. Also, now
- usage count is managed this way:
- -Count one if the auto_interface mode is on
- -Count one per configured interface
- 
- Jacques Gelinas (jacques@solucorp.qc.ca)
diff --git a/net/ipx/Kconfig b/net/ipx/Kconfig
index 980a826f5d02..e9ad0062fbb6 100644
--- a/net/ipx/Kconfig
+++ b/net/ipx/Kconfig
@@ -16,8 +16,7 @@ config IPX
           support", below.
 
           IPX is similar in scope to IP, while SPX, which runs on top of IPX,
-          is similar to TCP. There is also experimental support for SPX in
-          Linux (see "SPX networking", below).
+          is similar to TCP.
 
           To turn your Linux box into a fully featured NetWare file server and
           IPX router, say Y here and fetch either lwared from
@@ -26,9 +25,6 @@ config IPX
           information, read the IPX-HOWTO available from
           <http://www.tldp.org/docs.html#howto>.
 
-          General information about how to connect Linux, Windows machines and
-          Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
-
           The IPX driver would enlarge your kernel by about 16 KB. To compile
           this driver as a module, choose M here: the module will be called ipx.
           Unless you want to integrate your Linux box with a local Novell
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 11d504d0ac72..bf23e489e4cd 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -197,13 +197,12 @@ EXPORT_SYMBOL_GPL(nfnetlink_has_listeners);
 
 int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
 {
-        gfp_t allocation = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
         int err = 0;
 
         NETLINK_CB(skb).dst_group = group;
         if (echo)
                 atomic_inc(&skb->users);
-        netlink_broadcast(nfnl, skb, pid, group, allocation);
+        netlink_broadcast(nfnl, skb, pid, group, gfp_any());
         if (echo)
                 err = netlink_unicast(nfnl, skb, pid, MSG_DONTWAIT);
 
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 5bc37181662e..b931edee4b8b 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -173,7 +173,7 @@ static int netlbl_unlabel_list(struct sk_buff *skb, struct genl_info *info)
         return 0;
 
 list_failure:
-        kfree(ans_skb);
+        kfree_skb(ans_skb);
         return ret_val;
 }
 
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 256745321611..956cfe0ff7f8 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1401,7 +1401,7 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
 
         x = xfrm_state_lookup(&id->daddr, id->spi, id->proto, id->family);
         if (x == NULL) {
-                kfree(r_skb);
+                kfree_skb(r_skb);
                 return -ESRCH;
         }
 
@@ -1557,14 +1557,13 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct xfrm_usersa_info *p = &ue->state;
 
         x = xfrm_state_lookup(&p->id.daddr, p->id.spi, p->id.proto, p->family);
-                err = -ENOENT;
 
+        err = -ENOENT;
         if (x == NULL)
                 return err;
 
-        err = -EINVAL;
-
         spin_lock_bh(&x->lock);
+        err = -EINVAL;
         if (x->km.state != XFRM_STATE_VALID)
                 goto out;
         km_state_expired(x, ue->hard, current->pid);
@@ -1574,6 +1573,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
                 xfrm_audit_log(NETLINK_CB(skb).loginuid, NETLINK_CB(skb).sid,
                                AUDIT_MAC_IPSEC_DELSA, 1, NULL, x);
         }
+        err = 0;
 out:
         spin_unlock_bh(&x->lock);
         xfrm_state_put(x);