On Fri, 6 Nov 2020 13:39:02 +1100
Stephen Rothwell wrote:
> I fixed it up (the latter removed the code updated by the former, so I
> just used the latter) 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
Hi Thomas,
On Thu, 11 Jun 2020 12:43:24 +0200 Thomas Gleixner wrote:
>
> Sorry for that inconveniance. I'm about to get rid of the conflicts on
> the tip side.
Thanks. I do realise that it can take a little while between when
Linus adds something to his tree and previous versions get purged. I
Stephen Rothwell writes:
> Today's linux-next merge of the tip tree got conflicts in:
>
> include/linux/compiler.h
>
> between commits:
>
> dee081bf8f82 ("READ_ONCE: Drop pointer qualifiers when reading from scalar
> types")
> 9e343b467c70 ("READ_ONCE: Enforce atomicity for {READ,WRITE}_ONC
On Mon, May 18, 2020 at 03:10:32PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/compiler.h
>
> between commit:
>
> a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try")
>
> from Linus' tree and commit:
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> tools/power/x86/turbostat/turbostat.c
>
> between commit:
>
> cd188af5282d ("tools/power turbostat: Fix Haswell Core systems")
> b62b3184576b ("tools/power turbostat: add Jacobsvill
On Fri, Oct 12, 2018 at 3:47 AM, Ingo Molnar wrote:
>
> * Kees Cook wrote:
>
>> On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell
>> wrote:
>> > Hi all,
>> >
>> > Today's linux-next merge of the tip tree got a conflict in:
>> >
>> > arch/x86/mm/pgtable.c
>> >
>> > between commit:
>> >
>> >
* Kees Cook wrote:
> On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell
> wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/x86/mm/pgtable.c
> >
> > between commit:
> >
> > 184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
> >
> > from Linu
On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/mm/pgtable.c
>
> between commit:
>
> 184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
>
> from Linus' tree and commit:
>
> 1be3f247c288 ("x86/mm: A
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kvm/vmx.c
>
> between commit:
>
> c992384bde84 ("KVM: vmx: speed up MSR bitmap merge")
>
> from Linus' tree and commit:
>
> ff37dc0cd96c ("KVM/nVMX: Set the CPU_BASED_USE_M
- On Feb 9, 2018, at 1:25 PM, Will Deacon will.dea...@arm.com wrote:
> On Thu, Feb 08, 2018 at 07:04:56PM +, Mathieu Desnoyers wrote:
>> - On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
>>
>> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>> >>
>>
On Thu, Feb 08, 2018 at 07:04:56PM +, Mathieu Desnoyers wrote:
> - On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
>
> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
> >>
> >> * Will Deacon wrote:
> >>
> >> > For the sake of avoiding the conflict, can
- On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
> On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>>
>> * Will Deacon wrote:
>>
>> > For the sake of avoiding the conflict, can we just drop it for now, please?
>>
>> Yeah, so I resolved the conflict by mergi
On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>
> * Will Deacon wrote:
>
> > For the sake of avoiding the conflict, can we just drop it for now, please?
>
> Yeah, so I resolved the conflict by merging the (already upstream) bits and
> Linus
> pulled that resolution. From now on
* Will Deacon wrote:
> For the sake of avoiding the conflict, can we just drop it for now, please?
Yeah, so I resolved the conflict by merging the (already upstream) bits and
Linus
pulled that resolution. From now on the level of comments you want there is up
to
you! :-)
Thanks,
I
On Tue, Feb 06, 2018 at 05:05:52PM +, Mathieu Desnoyers wrote:
> - On Feb 6, 2018, at 9:11 AM, Will Deacon will.dea...@arm.com wrote:
>
> > On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
> >> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> >>
- On Feb 6, 2018, at 9:11 AM, Will Deacon will.dea...@arm.com wrote:
> On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
>> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
>> > On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
>> >> On
On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> > On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
> >> One approach I would consider for this is to duplicate this
> >> comment and add
- On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
>> - On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au
>> wrote:
>>
>> > Hi all,
>> >
>> > Today's linux-next merge of the tip tree
On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
> - On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au
> wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/arm64/kernel/entry.S
> >
> > between commit:
>
- On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/kernel/entry.S
>
> between commit:
>
> 4bf3286d29f3 ("arm64: entry: Hook up entry trampoline to exception vectors")
>
> fr
On Tue, Feb 06, 2018 at 11:54:38AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/sched/mm.h
>
> between commit:
>
> d70f2a14b72a ("include/linux/sched/mm.h: uninline mmdrop_async(), etc")
FWIW, akpm has a patch th
Hi Stephen,
On Tue, May 23, 2017 at 07:44:56AM +1000, Stephen Rothwell wrote:
> On Mon, 22 May 2017 09:32:15 +0100 Mark Rutland wrote:
> >
> > Just to check, is your copy of tip up-to-date?
>
> Yes, it was fetched just before being merged. I use the auto-latest
> branch of the tip tree which ma
Hi Mark,
On Mon, 22 May 2017 09:32:15 +0100 Mark Rutland wrote:
>
> Just to check, is your copy of tip up-to-date?
Yes, it was fetched just before being merged. I use the auto-latest
branch of the tip tree which may not be as up to date as the master
branch.
> That latter commit was in the tip
On Mon, May 22, 2017 at 01:27:11PM +1000, Stephen Rothwell wrote:
> Hi all,
Hi,
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/include/asm/cpufeature.h
>
> between commit:
>
> 63a1e1c95e60 ("arm64/cpufeature: don't use mutex in bringup path")
>
> from Linus'
On Wed, 2016-02-03 at 11:09 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/memremap.c
>
> between commit:
>
> eb7d78c9e7f6 ("devm_memremap_pages: fix vmem_altmap lifetime +
> alignment handling")
>
> from Linus' tree and
Hi Paolo,
On Mon, 6 Jul 2015 09:49:09 +0200 Paolo Bonzini wrote:
>
> On 06/07/2015 02:08, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > kernel/sched/core.c
> >
> > between commit:
> >
> > 2ecd9d29abb1 ("sched, preempt_notifier: separate no
On 06/07/2015 02:08, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/core.c
>
> between commit:
>
> 2ecd9d29abb1 ("sched, preempt_notifier: separate notifier
> registration from static_key inc/dec")
>
> from Linus' tree and c
* Ingo Molnar wrote:
>
> * H. Peter Anvin wrote:
>
> > On 05/20/2014 09:12 PM, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the tip tree got a conflict in
> > > arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64,
> > > modify_ldt: Make support for 16
* H. Peter Anvin wrote:
> Ok. Will do.
Thanks!
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tu
Ok. Will do.
On May 20, 2014 11:01:00 PM PDT, Ingo Molnar wrote:
>
>* H. Peter Anvin wrote:
>
>> On 05/20/2014 09:12 PM, Stephen Rothwell wrote:
>> > Hi all,
>> >
>> > Today's linux-next merge of the tip tree got a conflict in
>> > arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64,
>
* H. Peter Anvin wrote:
> On 05/20/2014 09:12 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in
> > arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64,
> > modify_ldt: Make support for 16-bit segments a runtime option")
> > from
On 05/20/2014 09:12 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64,
> modify_ldt: Make support for 16-bit segments a runtime option")
> from Linus' tree and commit 34273f41d57e ("x86
On 03/21/2014 09:53 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/kernel/cpu/perf_event_intel_uncore.c between commit 2c666adacc9e
> ("x86, intel, uncore: Fix CPU hotplug callback registration") from Linus'
> tree and commit 411cf18
On 02/18/2014 04:06 PM, Hans-Christian Egtvedt wrote:
> Around Tue 18 Feb 2014 14:09:20 +1100 or thereabout, Stephen Rothwell wrote:
>
> Hello Stephen,
>
>> Today's linux-next merge of the tip tree got a conflict in
>> arch/avr32/include/asm/Kbuild between commit d7668f9d448a ("avr32: add
>> gene
Around Tue 18 Feb 2014 14:09:20 +1100 or thereabout, Stephen Rothwell wrote:
Hello Stephen,
> Today's linux-next merge of the tip tree got a conflict in
> arch/avr32/include/asm/Kbuild between commit d7668f9d448a ("avr32: add
> generic vga.h to Kbuild") from the tree and commit b119fa61d440
> ("
On Thu, Jan 30, 2014 at 12:58:35PM +1100, Stephen Rothwell wrote:
> Hi Andi,
>
> On Wed, 29 Jan 2014 17:49:14 -0800 Andi Kleen wrote:
> >
> > > I fixed it up (see below) and can carry the fix as necessary (no action
> > > is required).
> >
> > I don't think the fix is correct, both sysctls need
Hi Andi,
On Wed, 29 Jan 2014 17:49:14 -0800 Andi Kleen wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> I don't think the fix is correct, both sysctls need to be kept. They
> do different things.
The tip tree commit 52bf84aa206c ("sched/
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I don't think the fix is correct, both sysctls need to be kept. They
do different things.
-Andi
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc kernel/sysctl.c
Hi Stephen,
On Fri, Jan 17, 2014 at 02:30:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> drivers/clocksource/cadence_ttc_timer.c between commit c1dcc927dae0
> ("clocksource: cadence_ttc: Fix mutex taken inside interrupt context")
> f
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> mm/huge_memory.c between commit 325adeb55e32 ("mm: huge_memory: Fix build
> error") from Linus' tree and commit 39d6cb39a817 ("mm/mpol: Use special
> PROT_NONE to migrate pages") from the tip tr
40 matches
Mail list logo
