Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbcDPX1M (ORCPT ); Sat, 16 Apr 2016 19:27:12 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:33381 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823AbcDPX1L (ORCPT ); Sat, 16 Apr 2016 19:27:11 -0400 Date: Sat, 16 Apr 2016 16:27:02 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Andrew Morton cc: "Kirill A. Shutemov" , Andrea Arcangeli , Andres Lagar-Cavilla , Yang Shi , Ning Qu , Stephen Rothwell , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH mmotm 1/5] huge tmpfs: try to allocate huge pages split into a team fix Message-ID: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 744 Lines: 23 Please replace the huge-tmpfs-try-to-allocate-huge-pages-split-into-a-team-fix.patch you added to your tree by this one: nothing wrong with Stephen's, but in this case I think the source is better off if we simply remove that BUILD_BUG() instead of adding an IS_ENABLED(): fixes build problem seen on arm when putting together linux-next. Reported-by: Stephen Rothwell Signed-off-by: Hugh Dickins --- mm/shmem.c | 1 - 1 file changed, 1 deletion(-) --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1744,7 +1744,6 @@ static inline struct page *shmem_hugetea static inline void shmem_disband_hugeteam(struct page *page) { - BUILD_BUG(); } static inline void shmem_added_to_hugeteam(struct page *page,