All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Borkmann <dborkman@redhat.com>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
	Nicolas Schichan <nschichan@freebox.fr>
Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree
Date: Tue, 21 May 2013 13:04:38 -0700	[thread overview]
Message-ID: <20130521130438.1ecdf535ab2461888abbe0c3@linux-foundation.org> (raw)
In-Reply-To: <20130521142948.444f09820c5406f9adc4b7f1@canb.auug.org.au>

On Tue, 21 May 2013 14:29:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
> call module_free() from any context") from the net-next tree and commit
> "bpf: add comments explaining the schedule_work() operation" from the
> akpm tree.
> 
> The former means that the latter is no longer required, so I used the
> former and can carry the fix as necessary (no action is required).

Yes, there have been a lot of conflicts in

seccomp-add-generic-code-for-jitted-seccomp-filters.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch
arm-net-bpf_jit-add-support-for-jitted-seccomp-filters.patch

recently and I'm presently seeing a compilation error.

Nicolas, I think the patches need a re-check so I'll drop the versions
which I presently have.  Please refresh, retest and resend when
convenient?  It'll need to be against linux-next, which is where the
conflicting (vfree/module_free) changes have occurred.



WARNING: multiple messages have this Message-ID (diff)
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Borkmann <dborkman@redhat.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Nicolas Schichan <nschichan@freebox.fr>
Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree
Date: Tue, 21 May 2013 13:04:38 -0700	[thread overview]
Message-ID: <20130521130438.1ecdf535ab2461888abbe0c3@linux-foundation.org> (raw)
In-Reply-To: <20130521142948.444f09820c5406f9adc4b7f1@canb.auug.org.au>

On Tue, 21 May 2013 14:29:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
> call module_free() from any context") from the net-next tree and commit
> "bpf: add comments explaining the schedule_work() operation" from the
> akpm tree.
> 
> The former means that the latter is no longer required, so I used the
> former and can carry the fix as necessary (no action is required).

Yes, there have been a lot of conflicts in

seccomp-add-generic-code-for-jitted-seccomp-filters.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch
arm-net-bpf_jit-add-support-for-jitted-seccomp-filters.patch

recently and I'm presently seeing a compilation error.

Nicolas, I think the patches need a re-check so I'll drop the versions
which I presently have.  Please refresh, retest and resend when
convenient?  It'll need to be against linux-next, which is where the
conflicting (vfree/module_free) changes have occurred.

  reply	other threads:[~2013-05-21 20:04 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-21  4:29 linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell
2013-05-21  4:29 ` Stephen Rothwell
2013-05-21 20:04 ` Andrew Morton [this message]
2013-05-21 20:04   ` Andrew Morton
2013-05-22  7:07   ` David Miller
2013-05-22  7:14     ` Andrew Morton
2013-05-22  7:19       ` David Miller
2013-05-22  7:48         ` Daniel Borkmann
  -- strict thread matches above, loose matches on Subject: below --
2020-06-02  9:30 Stephen Rothwell
2020-06-02  9:45 ` Stephen Rothwell
2019-07-03 10:49 Stephen Rothwell
2018-01-16  4:51 Stephen Rothwell
2017-03-20  5:10 Stephen Rothwell
2017-02-07  5:23 Stephen Rothwell
2017-02-07  8:40 ` Marc Kleine-Budde
2017-02-07  9:45   ` Stephen Rothwell
2015-05-14  7:39 Stephen Rothwell
2015-05-14  7:39 ` Stephen Rothwell
2015-05-14  7:38 Stephen Rothwell
2015-05-14  7:38 ` Stephen Rothwell
2014-07-23  8:18 Stephen Rothwell
2014-07-23  8:18 ` Stephen Rothwell
2013-11-06  9:00 Stephen Rothwell
2013-11-06  9:00 ` Stephen Rothwell
2013-11-06  8:55 Stephen Rothwell
2013-11-06  8:55 ` Stephen Rothwell
2013-05-21  4:32 Stephen Rothwell
2013-05-21  4:32 ` Stephen Rothwell
2013-05-21  4:25 Stephen Rothwell
2013-05-21  4:25 ` Stephen Rothwell
2013-05-21  7:44 ` Daniel Borkmann
2013-05-21 23:54   ` Stephen Rothwell
2013-05-22  9:20     ` Daniel Borkmann
2013-05-20  4:14 Stephen Rothwell
2013-05-20  4:14 ` Stephen Rothwell
2013-05-20  4:11 Stephen Rothwell
2013-05-20  4:11 ` Stephen Rothwell
2013-02-20  6:02 Stephen Rothwell
2013-02-20  6:02 ` Stephen Rothwell
2013-02-20  6:43 ` Cong Wang
2013-02-15  6:56 Stephen Rothwell
2013-02-15  6:56 ` Stephen Rothwell
2012-06-08  3:56 Stephen Rothwell
2012-06-08  3:56 ` Stephen Rothwell
2011-11-23  3:27 Stephen Rothwell
2011-11-23  3:27 ` Stephen Rothwell
2011-11-23  3:40 ` Neil Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130521130438.1ecdf535ab2461888abbe0c3@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=dborkman@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nschichan@freebox.fr \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.