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 tree and commit:
fce9501aec6b ("samples/bpf: fix build by setting HAVE_ATTR_TEST to zero
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/uapi/linux/time.h
between commits:
bcb3fc3247e5 ("arch: sparc: Override struct __kernel_old_timeval")
ca5e9aba753e ("time: Add time_types.h")
from the net-next tree and commit:
c70a772fda11 ("y2038: remove str
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 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 ...
from the net-next tree and commit:
7d9285e82db5 ("perf/bpf: Extend the perf_event_
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/events/core.c
between commit:
97562633bcba ("bpf: perf event change needed for subsequent bpf helpers")
from the net-next tree and commits:
7d9285e82db5 ("perf/bpf: Extend the perf_event_read_local() interface, a
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
Hi all,
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")
from the net-next tree and commit:
966a967116e6 ("smp: Avoid using two cache line
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
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: Identify kprobes trampolines as kernel text
area")
from
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/ti/Kconfig
between commit:
6246168b4a38 ("net: ethernet: ti: netcp: add support of cpts")
from the net-next tree and commit:
d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")
from the tip tre
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/sfc/Kconfig
between commit:
5a6681e22c14 ("sfc: separate out SFC4000 ("Falcon") support into new
sfc-falcon driver")
from the net-next tree and commit:
d1cbfd771ce8 ("ptp_clock: Allow for it to be
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/amd/Kconfig
between commits:
e78332b2285d ("amd-xgbe: Add ECC status support for the device memory")
abf0a1c2b26a ("amd-xgbe: Add support for SFP+ modules")
from the net-next tree and commit:
d1cb
19 matches
Mail list logo
