On Mon, Jun 18, 2018 at 01:49:47PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> On Mon, 18 Jun 2018 13:48:49 +1000 Stephen Rothwell
> wrote:
> >
> > I am still getting this.
>
> Maybe this was a bit premature :-)
Actually, this whole mess was due to me forgetting to do the merge-window
reset
Hi Paul,
On Mon, 18 Jun 2018 13:48:49 +1000 Stephen Rothwell
wrote:
>
> I am still getting this.
Maybe this was a bit premature :-)
--
Cheers,
Stephen Rothwell
pgpctU4_DnFxM.pgp
Description: OpenPGP digital signature
Hi all,
On Tue, 12 Jun 2018 10:46:07 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/iommu/amd_iommu.c
>
> between commit:
>
> 94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
>
> from Linus' tree and commit:
>
> 1df9bb
On Tue, Jun 12, 2018 at 10:46:07AM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/iommu/amd_iommu.c
>
> between commit:
>
> 94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
>
> from Linus' tree and commit:
>
>
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
drivers/iommu/amd_iommu.c
between commit:
94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
from Linus' tree and commit:
1df9bb146146 ("EXP iommu: Placeholder for fix in mainline")
from the rcu tree.
I fixed i
On Mon, May 14, 2018 at 01:46:36PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/nvme/host/core.c
>
> between commit:
>
> 12d9f07022dc ("nvme: fix use-after-free in nvme_free_ns_head")
>
> from Linus' tree and commit:
>
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
drivers/nvme/host/core.c
between commit:
12d9f07022dc ("nvme: fix use-after-free in nvme_free_ns_head")
from Linus' tree and commit:
d9cf21bae6cf ("nvme: Avoid flush dependency in delete controller flow")
from the rcu
Hi Paul,
On Mon, 25 Sep 2017 20:26:28 -0700 "Paul E. McKenney"
wrote:
>
> This conflict will disappear tomorrow, as I have merged the commit
> from Linus's tree in place of mine and have added another commit that
> removes the READ_ONCE()s. Same result, but no conflict. ;-)
Thanks, I figured
On Tue, Sep 26, 2017 at 01:00:18PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/rcu/tree.c
>
> between commit:
>
> 28585a832602 ("rcu: Allow for page faults in NMI handlers")
>
> from Linus' tree and commit:
>
> 3e2
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/rcu/tree.c
between commit:
28585a832602 ("rcu: Allow for page faults in NMI handlers")
from Linus' tree and commit:
3e2baa988b9c ("rcu: Allow for page faults in NMI handlers")
from the rcu tree.
I fixed it up
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
mm/slab_common.c
between commit:
657dc2f97220 ("slab: remove synchronous rcu_barrier() call in memcg cache
release path")
from Linus' tree and commit:
24b7cb25b8d1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_
Hi Paul,
On Wed, 8 Mar 2017 11:46:33 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> mm/slab_common.c
>
> between commit:
>
> 657dc2f97220 ("slab: remove synchronous rcu_barrier() call in memcg cache
> release path")
>
> from Linus' tree
On Wed, Mar 30, 2016 at 11:32:14AM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/rcu/tree.c
>
> between commit:
>
> abedf8e2419f ("rcu: Use simple wait queues where possible in rcutree")
>
> from Linus' tree and commit:
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/rcu/tree.c
between commit:
abedf8e2419f ("rcu: Use simple wait queues where possible in rcutree")
from Linus' tree and commit:
08cace5914ea ("DIAGS: Crude exploratory hack")
from the rcu tree.
I fixed it up (I
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/rcu/rcutorture.c
between commit:
25528213fe9f ("tags: Fix DEFINE_PER_CPU expansions")
from Linus' tree and commit:
0b36a04e0461 ("rcutorture: Remove redundant initialization to zero")
from the rcu tree.
I fixe
On Thu, Nov 29, 2012 at 02:06:51PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in
> arch/x86/kernel/ptrace.c between commit cb57a2b4cff7 ("x86-32: Export
> kernel_stack_pointer() for modules") from Linus' tree and commit
> 98dbec158343 ("co
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in
arch/x86/kernel/ptrace.c between commit cb57a2b4cff7 ("x86-32: Export
kernel_stack_pointer() for modules") from Linus' tree and commit
98dbec158343 ("context_tracking: New context tracking susbsystem") from
the rcu tree.
I fixed
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in
include/linux/sched.h between commit 907aed48f65e ("mm: allow PF_MEMALLOC
from softirq context") from Linus' tree and commit 46fc4e7c01b7 ("rcu:
Switch task's syscall hooks on context switch") from the rcu tree.
Just context chan
18 matches
Mail list logo
