Le 15/04/2021 à 12:08, Christophe Leroy a écrit :
Le 15/04/2021 à 12:07, Christophe Leroy a écrit :
Le 15/04/2021 à 11:58, Stephen Rothwell a écrit :
Hi all,
On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict
Le 15/04/2021 à 12:07, Christophe Leroy a écrit :
Le 15/04/2021 à 11:58, Stephen Rothwell a écrit :
Hi all,
On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/kernel/module.c
between commit:
Le 15/04/2021 à 11:58, Stephen Rothwell a écrit :
Hi all,
On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/kernel/module.c
between commit:
2ec13df16704 ("powerpc/modules: Load modules
Hi all,
On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/powerpc/kernel/module.c
>
> between commit:
>
> 2ec13df16704 ("powerpc/modules: Load modules closer to kernel text")
>
> from the powerpc
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/kernel/module.c
between commit:
2ec13df16704 ("powerpc/modules: Load modules closer to kernel text")
from the powerpc tree and commit:
4930ba789f8d ("powerpc/64s/radix: enable huge vmalloc
On Tue, Apr 13, 2021 at 06:59:36PM +1000, Stephen Rothwell wrote:
> diff --cc lib/test_kasan.c
> index 785e724ce0d8,bf9225002a7e..
> --- a/lib/test_kasan.c
> +++ b/lib/test_kasan.c
> @@@ -78,33 -83,30 +83,35 @@@ static void kasan_test_exit(struct kuni
>* fields, it can reorder or
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/test_kasan.c
between commits:
2603f8a78dfb ("kasan: Add KASAN mode kernel parameter")
e80a76aa1a91 ("kasan, arm64: tests supports for HW_TAGS async mode")
from the arm64 tree and commit:
c616ba7e0d63
Hi all,
On Thu, 8 Apr 2021 20:34:49 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> Makefile
This also affected init/Kconfig
> between commit:
>
> 2f8864dbe668 ("kbuild: move module strip/compression code into
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Makefile
between commit:
2f8864dbe668 ("kbuild: move module strip/compression code into
scripts/Makefile.modinst")
from the kbuild tree and commit:
7b35c1a01c2e ("init: add support for zstd compressed
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
block/blk-settings.c
between commit:
9bb33f24abbd ("block: refactor the bounce buffering code")
from the block tree and commit:
1d4982a2dc66 ("include: remove pagemap.h from blkdev.h")
from the akpm-current
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/watchdog.c
between commit:
89e28ce60cb6 ("workqueue/watchdog: Make unbound workqueues aware of
touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific
watchdog timestamps:")
(pity
On Mon, Mar 29, 2021 at 12:07 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/bitmap.h
>
> between commit:
>
> f7d5fbad07a4 ("lib: bitmap: order includes alphabetically")
>
> from the gpio-brgl tree and commit:
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/bitmap.h
between commit:
f7d5fbad07a4 ("lib: bitmap: order includes alphabetically")
from the gpio-brgl tree and commit:
f3b90426c407 ("kernel.h: drop inclusion in bitmap.h")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/x86/mm/init_64.c
between commit:
d9f6e12fb0b7 ("x86: Fix various typos in comments")
from the tip tree and commit:
68f7bf6e7e98 ("x86/vmemmap: drop handling of 4K unaligned vmemmap range")
from the
On 3/18/21 11:54 AM, Shakeel Butt wrote:
> On Wed, Mar 17, 2021 at 11:17 PM Stephen Rothwell
> wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>> mm/memcontrol.c
>>
>> between commit:
>>
>> 06d69d4c8669 ("mm: Charge active memcg when no mm
On Wed, Mar 17, 2021 at 11:17 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/memcontrol.c
>
> between commit:
>
> 06d69d4c8669 ("mm: Charge active memcg when no mm is set")
>
> from the block tree and commit:
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/memcontrol.c
between commit:
06d69d4c8669 ("mm: Charge active memcg when no mm is set")
from the block tree and commit:
674788258a66 ("memcg: charge before adding to swapcache on swapin")
from the
Hi all,
Tomorrow's linux-next merge of the akpm-current tree will get a
conflict in:
Documentation/admin-guide/kernel-parameters.txt
between commit:
f6e5aedf470b ("riscv: Add support for memtest")
from the risc-v tree and commit:
6b8f5ba8661b ("mm,memory_hotplug: add kernel boot option
Stephen Rothwell wrote:
> This is now a conflict between the fscache tree and Linus' tree.
I've rebased to -rc1 and repushed.
David
On Fri, Feb 26, 2021 at 06:16:26AM +0100, Christoph Hellwig wrote:
> On Fri, Feb 26, 2021 at 10:32:50AM +1100, Stephen Rothwell wrote:
> > > > - return filemap_read(iocb, to, ret);
> > > > + if (iocb->ki_flags & IOCB_NOWAIT)
> > > > + iocb->ki_flags |= IOCB_NOIO;
> > > >
Hi all,
On Thu, 11 Feb 2021 21:24:37 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/pagemap.h
>
> between commits:
>
> 13aecd8259dc ("mm: Implement readahead_control pageset expansion")
> 9a28f7e68602 ("netfs:
On Fri, Feb 26, 2021 at 10:32:50AM +1100, Stephen Rothwell wrote:
> > > -return filemap_read(iocb, to, ret);
> > > +if (iocb->ki_flags & IOCB_NOWAIT)
> > > +iocb->ki_flags |= IOCB_NOIO;
> > > +
> > > - ret = generic_file_buffered_read(iocb, to, ret);
> >
Hi all,
On Mon, 15 Feb 2021 08:46:34 +1100 Stephen Rothwell
wrote:
>
> On Wed, 27 Jan 2021 22:39:18 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > fs/btrfs/file.c
> >
> > between commit:
> >
> > 0225a20db6d8 ("btrfs:
Hi all,
On Mon, 15 Feb 2021 08:54:41 +1100 Stephen Rothwell
wrote:
>
> On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > fs/hugetlbfs/inode.c
> >
> > between commit:
> >
> > 2f221d6f7b88
Hi all,
On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/hugetlbfs/inode.c
>
> between commit:
>
> 2f221d6f7b88 ("attr: handle idmapped mounts")
>
> from the pidfd tree and commit:
>
>
Hi all,
On Wed, 27 Jan 2021 22:39:18 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> 0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync IO")
>
> from the btrfs tree and
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/pagemap.h
between commit:
13aecd8259dc ("mm: Implement readahead_control pageset expansion")
from the fscache tree and commit:
3ad6bba07ad0 ("mm/filemap: add mapping_seek_hole_data")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/pagemap.h
between commits:
13aecd8259dc ("mm: Implement readahead_control pageset expansion")
9a28f7e68602 ("netfs: Rename unlock_page_fscache() and
wait_on_page_fscache()")
from the fscache tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/cpumask.c
between commit:
2452483d9546 ("Revert "lib: Restrict cpumask_local_spread to houskeeping
CPUs"")
from Linus' tree and commits:
9eca9bb9bd98 ("lib: optimize cpumask_local_spread()")
Hi:
On 2021/1/27 19:43, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/hugetlbfs/inode.c
>
> between commit:
>
> 2f221d6f7b88 ("attr: handle idmapped mounts")
>
> from the pidfd tree and commit:
>
> 57d3629b7a9a
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/pagemap.h
between commits:
fa4910177245 ("vm: Add wait/unlock functions for PG_fscache")
13aecd8259dc ("mm: Implement readahead_control pageset expansion")
from the fscache tree and commits:
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/hugetlbfs/inode.c
between commit:
2f221d6f7b88 ("attr: handle idmapped mounts")
from the pidfd tree and commit:
57d3629b7a9a ("hugetlbfs: remove useless BUG_ON(!inode) in
hugetlbfs_setattr()")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/btrfs/file.c
between commit:
0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync IO")
from the btrfs tree and commit:
ddcd14c48a30 ("mm/filemap: rename generic_file_buffered_read to
On Thu, 17 Dec 2020 01:40:51 PST (-0800), andy.shevche...@gmail.com wrote:
On Thu, Dec 17, 2020 at 3:28 AM Stephen Rothwell wrote:
Hi all,
On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/Makefile
Hi Andy,
On Thu, 17 Dec 2020 11:40:51 +0200 Andy Shevchenko
wrote:
>
> Yeah, and it's slightly different. Perhaps RISC-V tree can handle this
> by moving Makefile entry somewhere else in the file.
Or just let Linus take care of it ...
--
Cheers,
Stephen Rothwell
pgprUxnfVtQtO.pgp
On Thu, Dec 17, 2020 at 3:28 AM Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > lib/Makefile
> >
> > between commit:
> >
> > 527701eda5f1 ("lib: Add a
On 2020/12/17 9:26, Stephen Rothwell wrote:
Hi all,
On Fri, 27 Nov 2020 18:34:41 +1100 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/Kconfig
between commit:
5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK")
from the risc-v
Hi all,
On Fri, 27 Nov 2020 18:34:41 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/riscv/Kconfig
>
> between commit:
>
> 5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK")
>
> from the risc-v tree and commit:
>
>
Hi all,
On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/Makefile
>
> between commit:
>
> 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
>
> from the risc-v tree and commits:
Hi all,
On Tue, 8 Dec 2020 20:40:16 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> drivers/misc/lkdtm/Makefile
> drivers/misc/lkdtm/lkdtm.h
> tools/testing/selftests/lkdtm/tests.txt
>
> between commit:
>
> 3ba150fb2120
Hi Jakub,
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
>
> AFAIU all we can do is tell Linus about the merge issue, and point
> at Stephen's resolution.
This is the correct response.
--
Cheers,
Stephen Rothwell
pgphDBS_HwAUg.pgp
Description: OpenPGP digital signature
On Mon, 14 Dec 2020 18:11:21 -0800 Andrew Morton wrote:
> On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
> > Hm. The code is in net-next by now. I was thinking of sending the
> > Networking PR later today (tonight?) as well. I'm happy to hold off
> > or do whatever you require, but I'd
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
> On Mon, 14 Dec 2020 17:40:21 -0800 Andrew Morton wrote:
> > On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> > > On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > > > On Fri, 4 Dec 2020 20:20:05 +1100
On Mon, 14 Dec 2020 17:40:21 -0800 Andrew Morton wrote:
> On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> > On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> > > wrote:
> > > > Today's linux-next merge of
On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got conflicts in:
> > >
On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got conflicts in:
> >
> > include/linux/memcontrol.h
> > mm/memcontrol.c
> >
> > between
On Mon, 14 Dec 2020 09:37:47 PST (-0800), andriy.shevche...@linux.intel.com
wrote:
On Mon, Dec 14, 2020 at 08:21:07PM +1100, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
527701eda5f1 ("lib: Add a
Hi all,
On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> include/linux/memcontrol.h
> mm/memcontrol.c
>
> between commit:
>
> bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data")
>
>
On Mon, Dec 14, 2020 at 08:21:07PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/Makefile
>
> between commit:
>
> 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
>
> from the risc-v tree and
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
from the risc-v tree and commits:
8250e121c672 ("lib/list_kunit: follow new file name convention for KUnit
On Fri, Dec 11, 2020 at 07:56:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/gup.c
>
> between commit:
>
> 2a4a06da8a4b ("mm/gup: Provide gup_get_pte() more generic")
>
> from the tip tree and commit:
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/gup.c
between commit:
2a4a06da8a4b ("mm/gup: Provide gup_get_pte() more generic")
from the tip tree and commit:
1eb2fe862a51 ("mm/gup: combine put_compound_head() and unpin_user_page()")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
drivers/misc/lkdtm/Makefile
drivers/misc/lkdtm/lkdtm.h
tools/testing/selftests/lkdtm/tests.txt
between commit:
3ba150fb2120 ("lkdtm/powerpc: Add SLB multihit test")
from the powerpc tree and commit:
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
include/linux/memcontrol.h
mm/memcontrol.c
between commit:
bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data")
from the bpf-next tree and commits:
6771a349b8c3 ("mm/memcg: remove incorrect
On Thu, Dec 03, 2020 at 07:06:01PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/uaccess.h
> index d841a560fae7,abb31aa1f8ca..
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@@ -186,64 -159,20 +159,43 @@@ static inline void
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/include/asm/uaccess.h
between commits:
923e1e7d8223 ("arm64: uaccess: rename privileged uaccess routines")
7cf283c7bd62 ("arm64: uaccess: remove redundant PAN toggling")
from the arm64 tree and
On Fri, Nov 27 2020 at 13:54, Andy Shevchenko wrote:
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.
On Fri, Nov 27, 2020 at 06:39:24PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/kernel.h
>
> between commit:
>
> 74d862b682f5 ("sched: Make migrate_disable/enable() independent of RT")
>
> from the tip
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/highmem.c
between commits:
298fa1ad5571 ("highmem: Provide generic variant of kmap_atomic*")
5fbda3ecd14a ("sched: highmem: Store local kmaps in task struct")
from the tip tree and commit:
72d22a0d0e86
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/kernel.h
between commit:
74d862b682f5 ("sched: Make migrate_disable/enable() independent of RT")
from the tip tree and commit:
761ace49e56f ("kernel.h: Split out mathematical helpers")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/Kconfig
between commit:
5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK")
from the risc-v tree and commit:
46b9b00649f6 ("arch, mm: restore dependency of __kernel_map_pages() on
DEBUG_PAGEALLOC")
from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/Kconfig
between commit:
5a3a47bf8367 ("orphans: Hoist '--orphan-handling' into Kconfig")
from the kspp tree and commits:
84d8b3661cc9 ("arm, arm64: move free_unused_memmap() to generic mm")
46b9b00649f6
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/mm.h
between commit:
95bb7c42ac8a ("mm: Add 'mprotect' hook to struct vm_operations_struct")
from the tip tree and commit:
6dd8e5dab7c1 ("mremap: don't allow MREMAP_DONTUNMAP on special_mappings
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/filemap.c
between commit:
0abed7c69b95 ("mm: never attempt async page lock if we've transferred data
already")
from the block tree and commit:
b5c7e73f6bd3 ("mm/filemap/c: break generic_file_buffered_read
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arc/Kconfig
between commit:
39cac191ff37 ("arc/mm/highmem: Use generic kmap atomic implementation")
from the tip tree and commit:
b41c56d2a9e6 ("arc: use FLATMEM with freeing of unused memory map instead
On 10/14/20 11:38 PM, Stephen Rothwell wrote:
Hi all,
On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/kunit/test.c
between commit:
45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format")
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/readahead.c
between commit:
fd0ec96ec35d ("readahead: use limited read-ahead to satisfy read")
from the block tree and commits:
16681dc9dd92 ("mm/readahead: pass readahead_control to force_page_cache_ra")
Hi all,
On Mon, 12 Oct 2020 19:48:21 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/Makefile
>
> between commit:
>
> 37a0dbf631f6 ("counters: Introduce counter_atomic* counters")
>
> from the counters tree and commit:
>
>
Hi all,
On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/kunit/test.c
>
> between commit:
>
> 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format")
>
> from the kunit-next tree and
Hi all,
On Mon, 21 Sep 2020 18:03:53 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> 0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map")
>
> from the arm64
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/sched.h
between commit:
d741bf41d7c7 ("kprobes: Remove kretprobe hash")
from the tip tree and commit:
faf4ffbfd1c5 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")
from the
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/kunit/test.c
between commit:
45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format")
from the kunit-next tree and commit:
e685acc91080 ("KUnit: KASAN Integration")
from the akpm-current tree.
I
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
37a0dbf631f6 ("counters: Introduce counter_atomic* counters")
from the counters tree and commit:
ed7f5253e189 ("mm/page_alloc.c: fix freeing non-compound pages")
from the
On Tue, 2020-10-06 at 21:48 -0700, Atish Patra wrote:
> On Tue, 2020-10-06 at 21:32 -0700, Palmer Dabbelt wrote:
> > On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict
> > > in:
> > >
> > >
On Tue, 2020-10-06 at 21:32 -0700, Palmer Dabbelt wrote:
> On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict
> > in:
> >
> > arch/riscv/mm/init.c
> >
> > between commit:
> >
> >
On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/mm/init.c
between commit:
c29c38fa2a8b ("RISC-V: Remove any memblock representing unusable memory area")
from the risc-v tree and
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/mm/init.c
between commit:
c29c38fa2a8b ("RISC-V: Remove any memblock representing unusable memory area")
from the risc-v tree and commits:
3520eeb79142 ("arch, drivers: replace for_each_membock()
On Thu, Oct 01, 2020 at 07:53:53PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/acpi/acpi_numa.h
>
> between commit:
>
> 4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")
>
> from the pm tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/acpi/acpi_numa.h
between commit:
4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")
from the pm tree and commit:
623347c1b949 ("x86/numa: cleanup configuration dependent command-line
On Mon, 28 Sep 2020 20:24:59 +1000
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/acpi/numa/hmat.c
>
> between commits:
>
> 01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables
> that are not
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/acpi/numa/hmat.c
between commits:
01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables
that are not SRAT")
4eb3723f18e9 ("ACPI: Rename acpi_map_pxm_to_online_node() to
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/page-writeback.c
between commit:
1cb039f3dc16 ("bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag")
from the block tree and commit:
7a3714df632a ("mm/page-writeback: support tail pages in
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/exit.c
between commit:
ba7d25f3dff6 ("exit: support non-blocking pidfds")
from the pidfd tree and patch:
"pid: move pidfd_get_pid() to pid.c"
from the akpm-current tree.
I fixed it up (I made the
On Mon, Sep 21, 2020 at 06:03:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index 087a844b4d26,64211436629d..
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp
> #endif
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map")
from the arm64 tree and commit:
8e19cbb9528f ("arch, drivers: replace for_each_membock() with
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/mm/kasan/kasan_init_32.c
between commit:
4c42dc5c69a8 ("powerpc/kasan: Fix CONFIG_KASAN_VMALLOC for 8xx")
from the powerpc tree and commit:
76713c119a9d ("arch, drivers: replace for_each_membock()
On Wed, Sep 16, 2020 at 04:22:03AM +, Song Bao Hua (Barry Song) wrote:
> > c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
> > CONFIG_CMA_AREAS")
> >
> > from the akpm-current tree.
>
> I guess this is because Mike's patch was written on top of dma-mapping's next
> branch.
ailing List
>
> Subject: linux-next: manual merge of the akpm-current tree with the
> dma-mapping tree
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/Kconfig
>
> between commit:
>
> b7176c261cdb ("dma-c
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/Kconfig
between commit:
b7176c261cdb ("dma-contiguous: provide the ability to reserve per-numa CMA")
from the dma-mapping tree and commit:
c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/dax/device.c
between commit:
4533d3aed857 ("memremap: rename MEMORY_DEVICE_DEVDAX to
MEMORY_DEVICE_GENERIC")
from Linus' tree and commit:
ceb1b473719c ("device-dax: make pgmap optional for instance
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
.clang-format
between commit:
4e4bb894467c ("clang-format: Update with the latest for_each macro list")
from Linus' tree and commits:
7008a2f408a3 ("memblock: implement for_each_reserved_mem_region() using
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/filemap.c
between commit:
76cd61739fd1 ("mm/error_inject: Fix allow_error_inject function signatures.")
from the net-next tree and commit:
2cb138387ead ("mm/filemap: fix storing to a THP shadow entry")
Hi all,
On Fri, 17 Jul 2020 20:14:11 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/crypto/mediatek/mtk-aes.c
>
> between commit:
>
> f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation")
>
> from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/sctp/socket.c
between commits:
89fae01eef8b ("sctp: switch sctp_setsockopt_auth_key to use memzero_explicit")
534d13d07e77 ("sctp: pass a kernel pointer to sctp_setsockopt_auth_key")
from the net-next tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/cpumask.c
between commit:
1abdfe706a57 ("lib: Restrict cpumask_local_spread to houskeeping CPUs")
from the tip tree and commit:
6f7ee3fd63c9 ("lib: optimize cpumask_local_spread()")
from the akpm-current
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/crypto/mediatek/mtk-aes.c
between commit:
f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation")
from the crypto tree and commit:
161f6a5cc3ea ("mm, treewide: rename kzfree() to
On Thu, Jul 16, 2020 at 06:00:12PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/init.c
>
> between commit:
>
> abb7962adc80 ("arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K
> and 64K configs")
>
> from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/init.c
between commit:
abb7962adc80 ("arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K and
64K configs")
from the arm64 tree and commit:
10d44973d8ab ("mm/hugetlb: split hugetlb_cma in
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/filesystems/proc.rst
between commit:
059db4341303 ("Documentation/filesystems/proc.rst: copy-editing cleanup")
from the jc_docs tree and commit:
7079aa70a489 ("doc, mm: clarify /proc//oom_score
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/cma.h
between commit:
a2b992c828f7 ("debugfs: make sure we can remove u32_array files cleanly")
from the net-next tree and commit:
bc7212aceef6 ("mm: cma: fix the name of CMA areas")
from the akpm-current
1 - 100 of 979 matches
Mail list logo
