Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
include/linux/memcontrol.h
mm/memcontrol.c
between commit:
bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data")
from the bpf-next tree and commits:
6771a349b8c3 ("mm/memcg: remove incorrect c
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/sysctl.c
between commit:
f461d2dcd511 ("sysctl: avoid forward declarations")
from the bpf-next tree and commits:
0fe73f87ba37 ("parisc: add sysctl file interface panic_on_stackoverflow")
631b6d13906c (
Hi all,
On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> include/linux/memcontrol.h
> mm/memcontrol.c
>
> between commit:
>
> bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data")
>
>
On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got conflicts in:
> >
> > include/linux/memcontrol.h
> > mm/memcontrol.c
> >
> > between com
On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got conflicts in:
> > >
On Mon, 14 Dec 2020 17:40:21 -0800 Andrew Morton wrote:
> On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> > On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
> > > wrote:
> > > > Today's linux-next merge of t
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
> On Mon, 14 Dec 2020 17:40:21 -0800 Andrew Morton wrote:
> > On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin wrote:
> > > On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > > > On Fri, 4 Dec 2020 20:20:05 +1100 Step
On Mon, 14 Dec 2020 18:11:21 -0800 Andrew Morton wrote:
> On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
> > Hm. The code is in net-next by now. I was thinking of sending the
> > Networking PR later today (tonight?) as well. I'm happy to hold off
> > or do whatever you require, but I'd
Hi Jakub,
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
>
> AFAIU all we can do is tell Linus about the merge issue, and point
> at Stephen's resolution.
This is the correct response.
--
Cheers,
Stephen Rothwell
pgphDBS_HwAUg.pgp
Description: OpenPGP digital signature
On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> f461d2dcd511 ("sysctl: avoid forward declarations")
>
> from the bpf-next tree and commits:
Hmm,
On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig wrote:
>
> On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > kernel/sysctl.c
> >
> > between commit:
> >
> > f461d2dcd511 ("sysctl
On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig wrote:
> >
> > On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
>
Hi Christoph,
On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig wrote:
>
> On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> > On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig wrote:
> > >
> > > On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> > >
On Wed, Apr 29, 2020 at 06:24:06PM +1000, Stephen Rothwell wrote:
> Hi Christoph,
>
> On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig wrote:
> >
> > On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> > > On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig wrote:
> > > >
14 matches
Mail list logo