Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38583f09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  agp: info leak in agpioc_info_wrap()
  fs/affs/super.c: bugfix / double free
  fanotify: fix -EOVERFLOW with large files on 64-bit
  slub: use sysfs'es release mechanism for kmem_cache
  revert "mm: vmscan: do not swap anon pages just because free+file is low"
  autofs: fix lockref lookup
  mm: filemap: update find_get_pages_tag() to deal with shadow entries
  mm/compaction: make isolate_freepages start at pageblock boundary
  MAINTAINERS: zswap/zbud: change maintainer email address
  mm/page-writeback.c: fix divide by zero in pos_ratio_polynom
  hugetlb: ensure hugepage access is denied if hugepages are not supported
  slub: fix memcg_propagate_slab_attrs
  drivers/rtc/rtc-pcf8523.c: fix month definition
parents 8169d300 3ca9e5d3

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9960,7 +9960,7 @@ F: drivers/net/hamradio/*scc.c 
F:	drivers/net/hamradio/z8530.h



ZBUD COMPRESSED PAGE ALLOCATOR

M:	Seth Jennings <sjenning@linux.vnet.ibm.com>

M:	Seth Jennings <sjennings@variantweb.net>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zbud.c
@@ -10005,7 +10005,7 @@ F: mm/zsmalloc.c 
F:	include/linux/zsmalloc.h



ZSWAP COMPRESSED SWAP CACHING

M:	Seth Jennings <sjenning@linux.vnet.ibm.com>

M:	Seth Jennings <sjennings@variantweb.net>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zswap.c

drivers/char/agp/frontend.c

+1 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ static int agpioc_info_wrap(struct agp_file_private *priv, void __user *arg) 


	agp_copy_info(agp_bridge, &kerninfo);



	memset(&userinfo, 0, sizeof(userinfo));

	userinfo.version.major = kerninfo.version.major;

	userinfo.version.minor = kerninfo.version.minor;

	userinfo.bridge_id = kerninfo.device->vendor |

drivers/rtc/rtc-pcf8523.c

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm) 
	tm->tm_hour = bcd2bin(regs[2] & 0x3f);

	tm->tm_mday = bcd2bin(regs[3] & 0x3f);

	tm->tm_wday = regs[4] & 0x7;

	tm->tm_mon = bcd2bin(regs[5] & 0x1f);

	tm->tm_mon = bcd2bin(regs[5] & 0x1f) - 1;

	tm->tm_year = bcd2bin(regs[6]) + 100;



	return rtc_valid_tm(tm);
@@ -229,7 +229,7 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	regs[3] = bin2bcd(tm->tm_hour);

	regs[4] = bin2bcd(tm->tm_mday);

	regs[5] = tm->tm_wday;

	regs[6] = bin2bcd(tm->tm_mon);

	regs[6] = bin2bcd(tm->tm_mon + 1);

	regs[7] = bin2bcd(tm->tm_year - 100);



	msg.addr = client->addr;

fs/affs/super.c

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) 
				&blocksize,&sbi->s_prefix,

				sbi->s_volume, &mount_flags)) {

		printk(KERN_ERR "AFFS: Error parsing options\n");

		kfree(sbi->s_prefix);

		kfree(sbi);

		return -EINVAL;

	}

	/* N.B. after this point s_prefix must be released */

fs/autofs4/root.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) 
		spin_lock(&active->d_lock);



		/* Already gone? */

		if (!d_count(active))

		if ((int) d_count(active) <= 0)

			goto next;



		qstr = &active->d_name;
@@ -230,7 +230,7 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry) 


		spin_lock(&expiring->d_lock);



		/* Bad luck, we've already been dentry_iput */

		/* We've already been dentry_iput or unlinked */

		if (!expiring->d_inode)

			goto next;