On (22/10/09 18:07), Sergey Senozhatsky wrote:
[..]
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 12368e773f3d..143c33bd6783 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -1623,9 +1623,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
> *
> * Corresponding ZRAM slot should be locked.
> */
> -static int zram_recompress(struct zram *zram,
> - u32 index,
> - struct page *page,
> +static int zram_recompress(struct zram *zram, u32 index, struct page *page,
> int size_watermark)
> {
> unsigned long handle_prev;
> @@ -1708,8 +1706,7 @@ static int zram_recompress(struct zram *zram,
>
> static ssize_t recompress_store(struct device *dev,
> struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> + const char *buf, size_t len)
> {
> struct zram *zram = dev_to_zram(dev);
> unsigned long nr_pages = zram->disksize >> PAGE_SHIFT;
D'oh, this patch should not contain any code changes, only
documentation updates. It's the previous patch in the series
that should contain these coding-style tweaks. Rebasing did
not go spectacularly well here...
Andrew, what's the best way to handle this?
