On Fri, Oct 18, 2019 at 01:31:39PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> samples/bpf/Makefile
>
> between commit:
>
> 1d97c6c2511f ("samples/bpf: Base target programs rules on Makefile.target")
>
> from the net-next tre
Hi all,
On Mon, 30 Oct 2017 20:55:47 + Mark Brown wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> net/ipv4/tcp_output.c
>
> between commit:
>
> 6aa7de059173a ("locking/atomics: COCCINELLE/treewide: Convert trivial
> ACCESS_ONCE() patterns to READ_ONCE()/WRIT
Hi Alexei,
On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov
wrote:
>
> Also what do you mean by "same patch != same commit" ?
> Like if we had pushed to some 3rd tree first and then pulled
> into tip and net-next it would have been better?
Well, it would not have caused a conflict.
--
Chee
On Wed, Nov 01, 2017 at 09:55:24AM +0100, Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
> >
> > * Peter Zijlstra wrote:
> >
> > > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of
Hi Peter,
On Wed, 1 Nov 2017 09:55:24 +0100 Peter Zijlstra wrote:
>
> Hmm, I thought having that same base patch in both trees would allow it
> to resolve that conflict. A well..
There is a difference between having he same patch and the same commit ...
--
Cheers,
Stephen Rothwell
* Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
> >
> > * Peter Zijlstra wrote:
> >
> > > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the tip tree got a conflict in:
> > >
On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
>
> * Peter Zijlstra wrote:
>
> > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > kernel/trace/bpf_trace.c
> > >
>
* Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > kernel/trace/bpf_trace.c
> >
> > between commits:
> >
> > 97562633bcba ("bpf: perf event change needed for s
On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/trace/bpf_trace.c
>
> between commits:
>
> 97562633bcba ("bpf: perf event change needed for subsequent bpf helpers")
> and more changes ...
Hi Dave,
On Thu, 31 Aug 2017 13:47:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/net/ethernet/cavium/liquidio/lio_main.c
>
> between commit:
>
> d1d97ee6e3a8 ("liquidio: moved liquidio_napi_drv_callback to lio_core.c")
>
> fr
On 02/20/2017 02:22 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/extable.c
between commit:
74451e66d516 ("bpf: make jited programs visible in traces")
from the net-next tree and commit:
5b485629ba0d ("kprobes, extable: Ident
On 4/7/15 12:04 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tip tree got a conflict in
samples/bpf/Makefile between commit 91bc4822c3d6 ("tc: bpf: add
checksum helpers") from the net-next tree and commit b896c4f95ab4
("samples/bpf: Add simple non-portable kprobe filter ex
On 4/7/15 12:11 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tip tree got a conflict in
include/uapi/linux/bpf.h between commit 96be4325f443 ("ebpf: add
sched_cls_type and map it to sk_filter's verifier ops"), 03e69b508b6f
("ebpf: add prandom helper for packet sampling"),
On 04/07/2015 09:11 AM, Stephen Rothwell wrote:
...
Today's linux-next merge of the tip tree got a conflict in
include/uapi/linux/bpf.h between commit 96be4325f443 ("ebpf: add
sched_cls_type and map it to sk_filter's verifier ops"), 03e69b508b6f
("ebpf: add prandom helper for packet sampling"), c
On 04/07/2015 09:00 AM, Stephen Rothwell wrote:
...
Today's linux-next merge of the tip tree got a conflict in
include/linux/bpf.h between commit 0fc174dea545 ("ebpf: make internal
bpf API independent of CONFIG_BPF_SYSCALL ifdefs") from the net-next
tree and commit 4e537f7fbdce ("bpf: Make intern
Hi Dave,
On Mon, 13 Jan 2014 21:48:41 -0800 (PST) David Miller
wrote:
>
> Net patch applied, thanks Stephen.
Thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpLeAmu5C984.pgp
Description: PGP signature
From: Stephen Rothwell
Date: Tue, 14 Jan 2014 16:44:20 +1100
> On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller
> wrote:
>>
>> From: "H. Peter Anvin"
>> Date: Mon, 13 Jan 2014 20:51:43 -0800
>>
>> > Is there a sensible way we can fix this in either net-next or tip?
>>
>> I think if I so
On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller
wrote:
>
> From: "H. Peter Anvin"
> Date: Mon, 13 Jan 2014 20:51:43 -0800
>
> > Is there a sensible way we can fix this in either net-next or tip?
>
> I think if I sort the files in net-next the problem will go away,
> if someone can confir
From: "H. Peter Anvin"
Date: Mon, 13 Jan 2014 20:51:43 -0800
> Is there a sensible way we can fix this in either net-next or tip?
I think if I sort the files in net-next the problem will go away,
if someone can confirm this I'll do it.
--
To unsubscribe from this list: send the line "unsubscribe
Hi,
On Mon, 13 Jan 2014 20:51:43 -0800 "H. Peter Anvin" wrote:
>
> On 01/13/2014 07:02 PM, Stephen Rothwell wrote:
> >
> > On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell
> > wrote:
> >>
> >> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell
> >> wrote:
> >>>
> >>> Today's linux-next
On 01/13/2014 07:02 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell
> wrote:
>>
>> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell
>> wrote:
>>>
>>> Today's linux-next merge of the tip tree got conflicts in
>>> arch/arc/include/asm/Kbuild, arc
Hi all,
On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell
wrote:
>
> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the tip tree got conflicts in
> > arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild,
> > arch/hexagon/include/asm/Kbui
Hi all,
On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got conflicts in
> arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild,
> arch/hexagon/include/asm/Kbuild, arch/microblaze/include/asm/Kbuild,
> arch/parisc/include/asm/Kbuild an
23 matches
Mail list logo
