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

Commit 4d0bd657 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  Josh has moved
  kexec: export free_huge_page to VMCOREINFO
  mm: fix filemap.c pagecache_get_page() kernel-doc warnings
  mm: debugfs: move rounddown_pow_of_two() out from do_fault path
  memcg: oom_notify use-after-free fix
  hwpoison: call action_result() in failure path of hwpoison_user_mappings()
  hwpoison: fix hugetlbfs/thp precheck in hwpoison_user_mappings()
  rapidio/tsi721_dma: fix failure to obtain transaction descriptor
  mm, thp: do not allow thp faults to avoid cpuset restrictions
  mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()
parents 26bcd8b7 e0198b29

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>

<josh@joshtriplett.org> <josht@us.ibm.com>

<josh@joshtriplett.org> <josht@vnet.ibm.com>

Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

CREDITS

+4 −3
Original line number Diff line number Diff line
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615 
S: Australia



N: Josh Triplett

E: josh@freedesktop.org

P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB

D: rcutorture maintainer

E: josh@joshtriplett.org

P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C  1E67 0ED9 A3DF 8AFF 873D

D: RCU and rcutorture

D: lock annotations, finding and fixing lock bugs

D: kernel tinification



N: Winfried Trümper

E: winni@xpilot.org

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7424,7 +7424,7 @@ S: Orphan 
F:	drivers/net/wireless/ray*



RCUTORTURE MODULE

M:	Josh Triplett <josh@freedesktop.org>

M:	Josh Triplett <josh@joshtriplett.org>

M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

drivers/rapidio/devices/tsi721_dma.c

+7 −1
Original line number Diff line number Diff line
@@ -287,6 +287,12 @@ struct tsi721_tx_desc *tsi721_desc_get(struct tsi721_bdma_chan *bdma_chan) 
			"desc %p not ACKed\n", tx_desc);

	}



	if (ret == NULL) {

		dev_dbg(bdma_chan->dchan.device->dev,

			"%s: unable to obtain tx descriptor\n", __func__);

		goto err_out;

	}



	i = bdma_chan->wr_count_next % bdma_chan->bd_num;

	if (i == bdma_chan->bd_num - 1) {

		i = 0;
@@ -297,7 +303,7 @@ struct tsi721_tx_desc *tsi721_desc_get(struct tsi721_bdma_chan *bdma_chan) 
	tx_desc->txd.phys = bdma_chan->bd_phys +

				i * sizeof(struct tsi721_dma_desc);

	tx_desc->hw_desc = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[i];



err_out:

	spin_unlock_bh(&bdma_chan->lock);



	return ret;

include/linux/hugetlb.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page); 
bool isolate_huge_page(struct page *page, struct list_head *list);

void putback_active_hugepage(struct page *page);

bool is_hugepage_active(struct page *page);

void free_huge_page(struct page *page);



#ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE

pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);