summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2024-04-15 14:37:55 -0700
committerAndrew Morton <akpm@linux-foundation.org>2024-04-15 14:37:55 -0700
commit233a8ee310b0647d78d672ea727f67fb8849a358 (patch)
treedd97b1e0761644eceaa27990fa5a588714669a7f
parent3820adbbeaa12b86ff1aa6e33db44b3ddd05c456 (diff)
download25-new-233a8ee310b0647d78d672ea727f67fb8849a358.tar.gz
foo
-rw-r--r--patches/maintainers-update-naoya-horiguchis-email-address.patch2
-rw-r--r--patches/mm-gup-consistently-name-gup-fast-functions.patch2
-rw-r--r--patches/mm-init_mlocked_on_free_v3.patch2
-rw-r--r--patches/mm-introduce-vma_pgtable_walk_beginend.patch2
-rw-r--r--patches/mm-make-__absent_pages_in_range-as-static.patch2
-rw-r--r--patches/mm-mm_initc-remove-arch_reserved_kernel_pages.patch2
-rw-r--r--patches/mm-mm_initc-remove-the-useless-dma_reserve.patch2
-rw-r--r--patches/mm-page_alloc-consolidate-free-page-accounting.patch4
-rw-r--r--patches/mm-take-placement-mappings-gap-into-account.patch2
-rw-r--r--patches/mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch2
-rw-r--r--patches/mm-use-get_unmapped_area_vmflags.patch2
-rw-r--r--patches/mm-use-gup-fast-instead-fast-gup-in-remaining-comments.patch2
-rw-r--r--pc/devel-series2
13 files changed, 14 insertions, 14 deletions
diff --git a/patches/maintainers-update-naoya-horiguchis-email-address.patch b/patches/maintainers-update-naoya-horiguchis-email-address.patch
index a742825ee..c1032d846 100644
--- a/patches/maintainers-update-naoya-horiguchis-email-address.patch
+++ b/patches/maintainers-update-naoya-horiguchis-email-address.patch
@@ -7,7 +7,7 @@ map it to my gmail address.
Link: https://lkml.kernel.org/r/20240412181720.18452-1-nao.horiguchi@gmail.com
Signed-off-by: Naoya Horiguchi <nao.horiguchi@gmail.com>
-Cc: Miaohe Lin <linmiaohe@huawei.com>
+Acked-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/patches/mm-gup-consistently-name-gup-fast-functions.patch b/patches/mm-gup-consistently-name-gup-fast-functions.patch
index 7deca5524..93508f9f7 100644
--- a/patches/mm-gup-consistently-name-gup-fast-functions.patch
+++ b/patches/mm-gup-consistently-name-gup-fast-functions.patch
@@ -71,7 +71,7 @@ Link: https://lkml.kernel.org/r/20240402125516.223131-2-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Cc: John Hubbard <jhubbard@nvidia.com>
+Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/patches/mm-init_mlocked_on_free_v3.patch b/patches/mm-init_mlocked_on_free_v3.patch
index d1580faef..5b8cdfed8 100644
--- a/patches/mm-init_mlocked_on_free_v3.patch
+++ b/patches/mm-init_mlocked_on_free_v3.patch
@@ -60,7 +60,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
default (disallow access to all but pkey 0). Can
--- a/include/linux/mm.h~mm-init_mlocked_on_free_v3
+++ a/include/linux/mm.h
-@@ -3761,7 +3761,14 @@ DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_
+@@ -3762,7 +3762,14 @@ DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_
static inline bool want_init_on_free(void)
{
return static_branch_maybe(CONFIG_INIT_ON_FREE_DEFAULT_ON,
diff --git a/patches/mm-introduce-vma_pgtable_walk_beginend.patch b/patches/mm-introduce-vma_pgtable_walk_beginend.patch
index d99730933..cbe989873 100644
--- a/patches/mm-introduce-vma_pgtable_walk_beginend.patch
+++ b/patches/mm-introduce-vma_pgtable_walk_beginend.patch
@@ -42,7 +42,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-introduce-vma_pgtable_walk_beginend
+++ a/include/linux/mm.h
-@@ -4229,4 +4229,7 @@ static inline bool pfn_is_unaccepted_mem
+@@ -4230,4 +4230,7 @@ static inline bool pfn_is_unaccepted_mem
return range_contains_unaccepted_memory(paddr, paddr + PAGE_SIZE);
}
diff --git a/patches/mm-make-__absent_pages_in_range-as-static.patch b/patches/mm-make-__absent_pages_in_range-as-static.patch
index 7dc6a9e10..bd0dd071a 100644
--- a/patches/mm-make-__absent_pages_in_range-as-static.patch
+++ b/patches/mm-make-__absent_pages_in_range-as-static.patch
@@ -17,7 +17,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-make-__absent_pages_in_range-as-static
+++ a/include/linux/mm.h
-@@ -3228,8 +3228,6 @@ static inline unsigned long get_num_phys
+@@ -3229,8 +3229,6 @@ static inline unsigned long get_num_phys
*/
void free_area_init(unsigned long *max_zone_pfn);
unsigned long node_map_pfn_alignment(void);
diff --git a/patches/mm-mm_initc-remove-arch_reserved_kernel_pages.patch b/patches/mm-mm_initc-remove-arch_reserved_kernel_pages.patch
index dcdad5f88..1b793ac84 100644
--- a/patches/mm-mm_initc-remove-arch_reserved_kernel_pages.patch
+++ b/patches/mm-mm_initc-remove-arch_reserved_kernel_pages.patch
@@ -43,7 +43,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-}
--- a/include/linux/mm.h~mm-mm_initc-remove-arch_reserved_kernel_pages
+++ a/include/linux/mm.h
-@@ -3260,9 +3260,6 @@ static inline void show_mem(void)
+@@ -3261,9 +3261,6 @@ static inline void show_mem(void)
extern long si_mem_available(void);
extern void si_meminfo(struct sysinfo * val);
extern void si_meminfo_node(struct sysinfo *val, int nid);
diff --git a/patches/mm-mm_initc-remove-the-useless-dma_reserve.patch b/patches/mm-mm_initc-remove-the-useless-dma_reserve.patch
index 52c940d72..833057180 100644
--- a/patches/mm-mm_initc-remove-the-useless-dma_reserve.patch
+++ b/patches/mm-mm_initc-remove-the-useless-dma_reserve.patch
@@ -17,7 +17,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-mm_initc-remove-the-useless-dma_reserve
+++ a/include/linux/mm.h
-@@ -3249,7 +3249,6 @@ static inline int early_pfn_to_nid(unsig
+@@ -3250,7 +3250,6 @@ static inline int early_pfn_to_nid(unsig
extern int __meminit early_pfn_to_nid(unsigned long pfn);
#endif
diff --git a/patches/mm-page_alloc-consolidate-free-page-accounting.patch b/patches/mm-page_alloc-consolidate-free-page-accounting.patch
index 67641589b..527621095 100644
--- a/patches/mm-page_alloc-consolidate-free-page-accounting.patch
+++ b/patches/mm-page_alloc-consolidate-free-page-accounting.patch
@@ -31,7 +31,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-page_alloc-consolidate-free-page-accounting
+++ a/include/linux/mm.h
-@@ -3796,24 +3796,22 @@ static inline bool page_is_guard(struct
+@@ -3797,24 +3797,22 @@ static inline bool page_is_guard(struct
return PageGuard(page);
}
@@ -62,7 +62,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
}
#else /* CONFIG_DEBUG_PAGEALLOC */
-@@ -3823,9 +3821,9 @@ static inline unsigned int debug_guardpa
+@@ -3824,9 +3822,9 @@ static inline unsigned int debug_guardpa
static inline bool debug_guardpage_enabled(void) { return false; }
static inline bool page_is_guard(struct page *page) { return false; }
static inline bool set_page_guard(struct zone *zone, struct page *page,
diff --git a/patches/mm-take-placement-mappings-gap-into-account.patch b/patches/mm-take-placement-mappings-gap-into-account.patch
index 2cf9fe9c9..aee895b5e 100644
--- a/patches/mm-take-placement-mappings-gap-into-account.patch
+++ b/patches/mm-take-placement-mappings-gap-into-account.patch
@@ -61,7 +61,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-take-placement-mappings-gap-into-account
+++ a/include/linux/mm.h
-@@ -3467,6 +3467,7 @@ struct vm_unmapped_area_info {
+@@ -3468,6 +3468,7 @@ struct vm_unmapped_area_info {
unsigned long high_limit;
unsigned long align_mask;
unsigned long align_offset;
diff --git a/patches/mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch b/patches/mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch
index bf3c78bd1..0557cccdf 100644
--- a/patches/mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch
+++ b/patches/mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch
@@ -12,7 +12,7 @@ Link: https://lkml.kernel.org/r/20240402125516.223131-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
-Cc: John Hubbard <jhubbard@nvidia.com>
+Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/patches/mm-use-get_unmapped_area_vmflags.patch b/patches/mm-use-get_unmapped_area_vmflags.patch
index 105157573..89c763930 100644
--- a/patches/mm-use-get_unmapped_area_vmflags.patch
+++ b/patches/mm-use-get_unmapped_area_vmflags.patch
@@ -58,7 +58,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/include/linux/mm.h~mm-use-get_unmapped_area_vmflags
+++ a/include/linux/mm.h
-@@ -3412,7 +3412,16 @@ extern int install_special_mapping(struc
+@@ -3413,7 +3413,16 @@ extern int install_special_mapping(struc
unsigned long randomize_stack_top(unsigned long stack_top);
unsigned long randomize_page(unsigned long start, unsigned long range);
diff --git a/patches/mm-use-gup-fast-instead-fast-gup-in-remaining-comments.patch b/patches/mm-use-gup-fast-instead-fast-gup-in-remaining-comments.patch
index b5a2f1622..83b7f65f6 100644
--- a/patches/mm-use-gup-fast-instead-fast-gup-in-remaining-comments.patch
+++ b/patches/mm-use-gup-fast-instead-fast-gup-in-remaining-comments.patch
@@ -9,7 +9,7 @@ Link: https://lkml.kernel.org/r/20240402125516.223131-4-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
-Cc: John Hubbard <jhubbard@nvidia.com>
+Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/pc/devel-series b/pc/devel-series
index d4f34e65f..3d827dfa7 100644
--- a/pc/devel-series
+++ b/pc/devel-series
@@ -752,7 +752,7 @@ kbuild-remove-redundant-extra-warning-flags.patch
kbuild-turn-on-wrestrict-by-default.patch
kbuild-enable-wformat-truncation-on-clang.patch
kbuild-enable-wcast-function-type-strict-unconditionally.patch
-kbuild-enable-wstringop-truncation-globally.patch
+#kbuild-enable-wstringop-truncation-globally.patch
#
intel_th-remove-usage-of-the-deprecated-ida_simple_xx-api.patch
hid-sony-remove-usage-of-the-deprecated-ida_simple_xx-api.patch