diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-12 11:22:31 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-12 18:43:34 -0400 |
| commit | fa46c0d82e72043da3ead2976fcc179e89ebaa9a (patch) | |
| tree | 3870ff0816c8bd7317813d92736d18433fd9686f | |
| parent | 342c68b98c497de24c9258981e7df4854b7b84b6 (diff) | |
| download | longterm-queue-2.6.34-fa46c0d82e72043da3ead2976fcc179e89ebaa9a.tar.gz | |
fix two trivial whitespace errors
To keep git am happy during test runs.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/GFS2-Fix-writing-to-non-page-aligned-gfs2_quota-stru.patch | 4 | ||||
| -rw-r--r-- | queue/USB-ftdi_sio-Added-IDs-for-CTI-USB-Serial-Devices.patch | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/queue/GFS2-Fix-writing-to-non-page-aligned-gfs2_quota-stru.patch b/queue/GFS2-Fix-writing-to-non-page-aligned-gfs2_quota-stru.patch index 6558eef..a423ee2 100644 --- a/queue/GFS2-Fix-writing-to-non-page-aligned-gfs2_quota-stru.patch +++ b/queue/GFS2-Fix-writing-to-non-page-aligned-gfs2_quota-stru.patch @@ -16,6 +16,8 @@ With this patch, I don't see the bug anymore using the reproducer in Red Hat bz 555754. I successfully ran a couple of simple tests/mounts/ umounts and it doesn't seem like this patch breaks anything else. +[PG: fix cosmetic whitespace warning coming from git am] + Signed-off-by: Abhi Das <adas@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> @@ -153,7 +155,7 @@ index 6dbcbad..fcd76f9 100644 - /* +1 in the end for block requested above for unstuffing */ - blocks = num_qd * data_blocks + RES_DINODE + num_qd + 1; + /* +3 in the end for unstuffing block, inode size update block -+ * and another block in case quota straddles page boundary and ++ * and another block in case quota straddles page boundary and + * two blocks need to be updated instead of 1 */ + blocks = num_qd * data_blocks + RES_DINODE + num_qd + 3; diff --git a/queue/USB-ftdi_sio-Added-IDs-for-CTI-USB-Serial-Devices.patch b/queue/USB-ftdi_sio-Added-IDs-for-CTI-USB-Serial-Devices.patch index 433a58d..21cc362 100644 --- a/queue/USB-ftdi_sio-Added-IDs-for-CTI-USB-Serial-Devices.patch +++ b/queue/USB-ftdi_sio-Added-IDs-for-CTI-USB-Serial-Devices.patch @@ -7,6 +7,8 @@ commit 5a9443f08c83c294c5c806a689c1184b27cb26b3 upstream. I added new ProdutIds for two devices from CTI GmbH Leipzig. +[PG: fix cosmetic whitespace warning coming from git am] + Signed-off-by: Christian Simon <simon@swine.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> @@ -32,7 +34,7 @@ diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids index 73d8c79..cdcd224 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h -@@ -1146,3 +1146,13 @@ +@@ -1146,3 +1146,11 @@ */ #define QIHARDWARE_VID 0x20B7 #define MILKYMISTONE_JTAGSERIAL_PID 0x0713 @@ -44,8 +46,6 @@ index 73d8c79..cdcd224 100644 +#define FTDI_CTI_MINI_PID 0xF608 +/* USB-Nano-485*/ +#define FTDI_CTI_NANO_PID 0xF60B -+ -+ -- 1.7.4.4 |