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

Commit fc3ac5c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge misc fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: add closing angle bracket to Vince Bridgers' email address
  Documentation: fix DOCBOOKS=... building
  ocfs2: fix double kmem_cache_destroy in dlm_init
  mm/memory-failure.c: fix memory leak by race between poison and unpoison
  wait: swap EXIT_ZOMBIE(Z) and EXIT_DEAD(X) chars in TASK_STATE_TO_CHAR_STR
  memcg: fix swapcache charge from kernel thread context
  mm: madvise: fix MADV_WILLNEED on shmem swapouts
  mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
  hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage
parents 9abd09ac 0d9327ab

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ L: linux-alpha@vger.kernel.org 
F:	arch/alpha/



ALTERA TRIPLE SPEED ETHERNET DRIVER

M:	Vince Bridgers <vbridgers2013@gmail.com

M:	Vince Bridgers <vbridgers2013@gmail.com>

L:	netdev@vger.kernel.org

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

S:	Maintained

fs/ocfs2/dlm/dlmmaster.c

+6 −2
Original line number Diff line number Diff line
@@ -472,11 +472,15 @@ int dlm_init_master_caches(void) 


void dlm_destroy_master_caches(void)

{

	if (dlm_lockname_cache)

	if (dlm_lockname_cache) {

		kmem_cache_destroy(dlm_lockname_cache);

		dlm_lockname_cache = NULL;

	}



	if (dlm_lockres_cache)

	if (dlm_lockres_cache) {

		kmem_cache_destroy(dlm_lockres_cache);

		dlm_lockres_cache = NULL;

	}

}



static void dlm_lockres_release(struct kref *kref)

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq); 
#define TASK_PARKED		512

#define TASK_STATE_MAX		1024



#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP"

#define TASK_STATE_TO_CHAR_STR "RSDTtXZxKWP"



extern char ___assert_task_state[1 - 2*!!(

		sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];

mm/filemap.c

+4 −2
Original line number Diff line number Diff line
@@ -257,9 +257,11 @@ static int filemap_check_errors(struct address_space *mapping) 
{

	int ret = 0;

	/* Check for outstanding write errors */

	if (test_and_clear_bit(AS_ENOSPC, &mapping->flags))

	if (test_bit(AS_ENOSPC, &mapping->flags) &&

	    test_and_clear_bit(AS_ENOSPC, &mapping->flags))

		ret = -ENOSPC;

	if (test_and_clear_bit(AS_EIO, &mapping->flags))

	if (test_bit(AS_EIO, &mapping->flags) &&

	    test_and_clear_bit(AS_EIO, &mapping->flags))

		ret = -EIO;

	return ret;

}