Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/x86/xen/smp_pv.c
between commit:
66a07b44e765 ("x86/entry: Switch XEN/PV hypercall entry to IDTENTRY")
from the tip tree and patch:
"mm: introduce include/linux/pgtable.h"
from the akpm tree.
I fixed it up (see
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
mm/swap.c
between commit:
b01b2141 ("mm/swap: Use local_lock for protection")
from the tip tree and patch:
"mm/swap.c: annotate data races for lru_rotate_pvecs"
from the akpm tree.
I fixed it up (see below) and c
On Wed, 13 Feb 2019 17:49:28 +1100 Stephen Rothwell
wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> scripts/atomic/check-atomics.sh
>
> between commit:
>
> 4ad119545d78 ("locking/atomics: Check atomic headers with sha1sum")
>
> from the tip tree and
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
scripts/atomic/check-atomics.sh
between commit:
4ad119545d78 ("locking/atomics: Check atomic headers with sha1sum")
from the tip tree and patch:
"scripts/atomic/check-atomics.sh: don't assume that scripts are executabl
On Tue, 2018-01-09 at 16:02 +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/x86/platform/intel-mid/device_libs/platform_bt.c
>
> between commit:
>
> 9d0513d82f1a ("x86/platform/intel-mid: Revert "Make 'bt_sfi_data'
> cons
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
arch/x86/platform/intel-mid/device_libs/platform_bt.c
between commit:
9d0513d82f1a ("x86/platform/intel-mid: Revert "Make 'bt_sfi_data' const"")
from the tip tree and patch:
"arch/x86/platform/intel-mid/device_libs/
On Mon, Oct 16, 2017 at 07:48:10PM +0100, Mark Brown wrote:
> I don't feel confident fixing this up, I'm trying to figure out how to
> drop one of the commits but this script isn't the clearest in it's
> intent.
OK, I might've figured it out or I might've made a terrible mess.
Either way it seems
Hi Andrew,
Today's linux-next merge of (well, import of) the akpm tree got a
conflict in:
include/linux/sched/mm.h
between commit:
68e21be2916b35 ("sched/headers: Move task->mm handling methods to
")
from the tip tree and commit:
d3a5cfa169959b ("include/linux/sched/mm.h: uninline mmdr
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in:
arch/x86/mm/init.c
arch/x86/mm/ioremap.c
between commit:
66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h")
from the tip tree and patch:
"x86: use set_memory.h header"
from the akpm tree.
I fixed i
On Fri, Mar 31, 2017 at 09:02:42AM -0700, Andi Kleen wrote:
> On Fri, Mar 31, 2017 at 04:45:46PM +0200, Peter Zijlstra wrote:
> > On Fri, Mar 31, 2017 at 06:54:48AM -0700, Andi Kleen wrote:
> > > > Argh!
> > > >
> > > > Andrew, please drop that patch. And the x86 out-of-line of
> > > > __atomic_a
On Fri, Mar 31, 2017 at 04:45:46PM +0200, Peter Zijlstra wrote:
> On Fri, Mar 31, 2017 at 06:54:48AM -0700, Andi Kleen wrote:
> > > Argh!
> > >
> > > Andrew, please drop that patch. And the x86 out-of-line of
> > > __atomic_add_unless().
> >
> > Why dropping the second? Do you have something be
On Fri, Mar 31, 2017 at 06:54:48AM -0700, Andi Kleen wrote:
> > Argh!
> >
> > Andrew, please drop that patch. And the x86 out-of-line of
> > __atomic_add_unless().
>
> Why dropping the second? Do you have something better?
The try_cmpxchg() patches save about half the text, and do not have the
> Argh!
>
> Andrew, please drop that patch. And the x86 out-of-line of
> __atomic_add_unless().
Why dropping the second? Do you have something better?
On the first there were no 0day regressions, so at least basic performance
checking has been done.
-Andi
On Fri, Mar 31, 2017 at 04:44:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> kernel/sched/fair.c
>
> between commit:
>
> 0ccb977f4c80 ("sched/fair: Explicitly generate __update_load_avg()
> instances")
>
> from the tip tr
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
kernel/sched/fair.c
between commit:
0ccb977f4c80 ("sched/fair: Explicitly generate __update_load_avg() instances")
from the tip tree and patch:
"kernel/sched/fair.c: uninline __update_load_avg()"
from the akpm tree.
On Fri, Mar 24, 2017 at 04:40:26PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/x86/include/asm/atomic.h
>
> between commit:
>
> e6790e4b5d5e ("locking/atomic/x86: Use atomic_try_cmpxchg()")
>
> from the tip tree and pat
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/x86/include/asm/atomic.h
between commit:
e6790e4b5d5e ("locking/atomic/x86: Use atomic_try_cmpxchg()")
from the tip tree and patch:
"x86/atomic: move __arch_atomic_add_unless out of line"
from the akpm tree.
I f
On Thu, 10 Mar 2016 09:00:25 +0100 Ingo Molnar wrote:
>
> * Stephen Rothwell wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in:
> >
> > drivers/gpu/drm/omapdrm/omap_gem.c
> >
> > between commit:
> >
> > f6e45661f9be ("dma, mm/pat: Rename dma_*_
* Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> drivers/gpu/drm/omapdrm/omap_gem.c
>
> between commit:
>
> f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
>
> from the tip tree and patch:
>
> "dma-map
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/gpu/drm/omapdrm/omap_gem.c
between commit:
f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
from the tip tree and patch:
"dma-mapping: rename dma_*_writecombine() to dma_*_wc()"
from
* Matt Fleming wrote:
> On Tue, 09 Feb, at 03:50:24PM, Stephen Rothwell wrote:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in:
> >
> > arch/x86/platform/efi/efi.c
> >
> > between commit:
> >
> > 1e82b9479070 ("x86/efi: Show actual ending addresses in e
On Tue, 09 Feb, at 03:50:24PM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/x86/platform/efi/efi.c
>
> between commit:
>
> 1e82b9479070 ("x86/efi: Show actual ending addresses in efi_print_memmap")
>
> from the tip tree and
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
arch/x86/platform/efi/efi.c
between commit:
1e82b9479070 ("x86/efi: Show actual ending addresses in efi_print_memmap")
from the tip tree and commit:
e0532ef9f825 ("x86/efi: print size and base in binary units in
ef
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/entry/entry_64_compat.S between commit 7a5a9824c18f
("x86/asm/entry/32: Remove unnecessary optimization in stub32_clone")
from the tip tree and commit cfb3fabb5c2c ("x86: opt into
HAVE_COPY_THREAD_TLS, for both 32-bit
Hi Ingo,
On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar wrote:
>
>
> * Stephen Rothwell wrote:
>
> > Today's linux-next merge of the akpm tree got a conflict in
> > arch/x86/kernel/cpu/common.c between commit 6b51311c9765
> > ("x86/asm/entry/64: Use a define for an invalid segment selector") fr
On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar wrote:
>
> * Stephen Rothwell wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > arch/x86/kernel/cpu/common.c between commit 6b51311c9765
> > ("x86/asm/entry/64: Use a define for an invalid segment sele
* Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> arch/x86/kernel/cpu/common.c between commit 6b51311c9765
> ("x86/asm/entry/64: Use a define for an invalid segment selector") from
> the tip tree and commit f28c11e4b695 ("arch/x86/kernel/cp
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/cpu/common.c between commit 6b51311c9765
("x86/asm/entry/64: Use a define for an invalid segment selector") from
the tip tree and commit f28c11e4b695 ("arch/x86/kernel/cpu/common.c:
fix warning") from the akpm t
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/include/asm/Kbuild between commit 073d8224d299 ("arch: Remove
stub cputime.h headers") from the tip tree and commit "x86: use generic
early_ioremap" from the akpm tree.
I fixed it up (see below) and can carry the fix
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/softirq.c between commit c795eb55e740 ("sched/preempt, locking:
Rework local_bh_{dis,en}able()") from the tip tree and commit ("softirq:
use const char * const for softirq_to_name, whitespace neatening") from
the akpm t
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/posix-cpu-timers.c between commits a85721601ad2 ("posix_timers:
Kick full dynticks CPUs when a posix cpu timer is armed") and
555347f6c080 ("posix_timers: New API to prevent from stopping the tick
when timers are running
On 02/13/2013 08:25 PM, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 63a3f603413f ("timeconst.pl: Eliminate
Perl warning") from the tip tree and commit "timeconst.pl: remove
deprecated defined(@array)" from the
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/sched.h between commit cf4aebc292fa ("sched: Move sched.h
sysctl bits into separate header") from the tip tree and commit "aio:
don't include aio.h in sched.h" from the akpm tree.
I fixed it up (see below) and ca
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 63a3f603413f ("timeconst.pl: Eliminate
Perl warning") from the tip tree and commit "timeconst.pl: remove
deprecated defined(@array)" from the akpm tree.
These both fix the same problem, I arb
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/mm/numa.c between commit 07f4207a305c ("x86-32, mm: Remove
reference to alloc_remap()") from the tip tree and commit "x86: get
pg_data_t's memory from other node" from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/smp.c
between commit c7b798525b50 ("smp: Fix SMP function call empty cpu mask race")
from the tip tree and commit "smp: make smp_call_function_many() use logic
similar to smp_call_function_single()" from the akpm tree
Hi guys,
On Mon, Dec 10, 2012 at 08:01:39AM +, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in mm/memory.c
> between changes in commits from the tip tree and commit "mm: thp: set the
> accessed flag for old pages on access fault" from the akpm tree.
>
> I
hi Stephen,
* Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in mm/mprotect.c
> between commit ("2083d67027ad") from the tip tree and commit "thp:
> change split_huge_page_pmd() interface" from the akpm tree.
>
> I fixed it up (see below) an
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/mprotect.c
between commit ("2083d67027ad") from the tip tree and commit "thp:
change split_huge_page_pmd() interface" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required)
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/huge_memory.c between commit 2083d67027ad ("mm/mempolicy: Implement
change_prot_numa() in terms of change_protection()") from the tip, tree
and commit "thp: change_huge_pmd(): make sure we don't try to make a page
writable"
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/mempolicy.c between commit d9f1eb872704 ("numa, mempolicy: Improve
CONFIG_NUMA_BALANCING=y OOM behavior") from the tip tree and commit "mm,
mempolicy: remove duplicate code" from the akpm tree.
I can't tell if the akpm tree
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in mm/migrate.c
and include/linux/migrate.h between commits 070059b28578 ("mm/compaction:
Move migration fail/success stats to migrate.c") and 2d85cca46951
("mm/migrate: Add a tracepoint for migrate_pages") from the tip tree and
co
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/memory.c
between changes in commits from the tip tree and commit "mm: thp: set the
accessed flag for old pages on access fault" from the akpm tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/huge_memory.c between various commits from the tip tree and commit
"thp: fix update_mmu_cache_pmd() calls" from the akpm tree.
It appears that the shed/numa patches in the tip tree have been changed
in today's version of th
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/mprotect.c
between commit a9463d90124a ("mm: Count the number of pages affected in
change_protection()") from the tip tree and commit "thp: change
split_huge_page_pmd() interface" from the akpm tree.
I fixed it up (see belo
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/mempolicy.c between commit e9d5bc24d665 ("mm/mpol: Make mempolicy
home-node aware") from the tip tree and commit "mempolicy: fix a memory
corruption by refcount imbalance in alloc_pages_vma()" from the akpm tree.
I fixed it
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/huge_memory.c between commit 93c9d633bd9e ("93c9d633bd9e") from the
tip tree and commit "thp: introduce pmdp_invalidate()" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is requi
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/huge_memory.c between commit 93c9d633bd9e ("mm/thp: Preserve pgprot
across huge page split") from the tip tree and commit ("thp: remove
assumptions on pgtable_t type") from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/huge_memory.c between commit 93c9d633bd9e ("mm/thp: Preserve pgprot
across huge page split") from the tip tree and commit "thp: merge page
pre-alloc in khugepaged_loop into khugepaged_do_scan" from the akpm tree.
I fixed it
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/mempolicy.c between commit 4d58c795f691 ("mm/mpol: Check for misplaced
page") from the tip tree and commit "mempolicy: fix refcount leak in
mpol_set_shared_policy()" from the akpm tree.
I fixed it up (see below) and can car
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/mm.h between commit 1dbd3d35fe64 ("mm/pgprot: Move the
pgprot_modify() fallback definition to mm.h") from the tip tree and
commit "mm, x86, pat: rework linear pfn-mmap tracking" from the akpm tree.
I fixed it up
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/cpu/perf_event_intel_uncore.h between commit 254298c726b9
("perf/x86: Add Intel Nehalem-EX uncore support") from the tip tree and
commit "arch/x86/kernel/cpu/perf_event_intel_uncore.h: make
UNCORE_PMU_HRTIMER_IN
On Wed, 25 Jul 2012 12:26:13 -0700
Andrew Morton wrote:
> On Wed, 25 Jul 2012 21:03:51 +0200
> Ingo Molnar wrote:
>
> > > This means that if the above code reappears in linux-next or
> > > mainline, the current copy of
> > > mm-memcg-fix-compaction-migration-failing-due-to-memcg-limits.patch
* Andrew Morton wrote:
> On Wed, 25 Jul 2012 21:03:51 +0200
> Ingo Molnar wrote:
>
> > > This means that if the above code reappears in linux-next or
> > > mainline, the current copy of
> > > mm-memcg-fix-compaction-migration-failing-due-to-memcg-limits.patch
> > > will no longer update it,
Hi all,
On Wed, 25 Jul 2012 09:35:03 +0200 Johannes Weiner wrote:
>
> On Wed, Jul 25, 2012 at 09:10:44AM +0200, Ingo Molnar wrote:
> >
> > * Stephen Rothwell wrote:
> >
> > > Today's linux-next merge of the akpm tree got a conflict in
> > > mm/migrate.c between the tip tree and commit "mm: me
On Wed, 25 Jul 2012 21:03:51 +0200
Ingo Molnar wrote:
> > This means that if the above code reappears in linux-next or
> > mainline, the current copy of
> > mm-memcg-fix-compaction-migration-failing-due-to-memcg-limits.patch
> > will no longer update it, and I probably won't notice that
> > o
On Wed, Jul 25, 2012 at 11:57:13AM -0700, Andrew Morton wrote:
> On Wed, 25 Jul 2012 09:35:03 +0200
> Johannes Weiner wrote:
>
> > As this is unlikely to reappear in this merge window, the conflict
> > resolution is quite simple. All that's needed is remove the 3 hunks
> > from my patch that con
* Andrew Morton wrote:
> On Wed, 25 Jul 2012 09:35:03 +0200
> Johannes Weiner wrote:
>
> > As this is unlikely to reappear in this merge window, the conflict
> > resolution is quite simple. All that's needed is remove the 3 hunks
> > from my patch that converted a user in Peter's patch to a n
On Wed, 25 Jul 2012 09:35:03 +0200
Johannes Weiner wrote:
> As this is unlikely to reappear in this merge window, the conflict
> resolution is quite simple. All that's needed is remove the 3 hunks
> from my patch that converted a user in Peter's patch to a new API. I
> can resend the series if
On Wed, Jul 25, 2012 at 09:10:44AM +0200, Ingo Molnar wrote:
>
> * Stephen Rothwell wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > mm/migrate.c between the tip tree and commit "mm: memcg: fix
> > compaction/migration failing due to memcg limits
* Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> mm/migrate.c between the tip tree and commit "mm: memcg: fix
> compaction/migration failing due to memcg limits" from the
> akpm tree.
>
> The commit 4783af477d3d ("mm: Migrate misplaced
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/migrate.c
between the tip tree and commit "mm: memcg: fix compaction/migration
failing due to memcg limits" from the akpm tree.
The commit 4783af477d3d ("mm: Migrate misplaced page") was removed (among
several others) from
62 matches
Mail list logo
