From: Rusty Russell <rusty@rustcorp•com.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>,
Linus <torvalds@linux-foundation•org>,
Kees Cook <keescook@chromium•org>,
Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: manual merge of the modules tree with the tree
Date: Wed, 24 Oct 2012 10:51:49 +1030 [thread overview]
Message-ID: <87vce0oh2a.fsf@rustcorp.com.au> (raw)
In-Reply-To: <20121022123553.240d9ddf05cd5e2c8fee0ab3@canb.auug.org.au>
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi Rusty,
>
> Today's linux-next merge of the modules tree got a conflict in
> kernel/module.c between commit caabe240574a ("MODSIGN: Move the magic
> string to the end of a module and eliminate the search") from Linus' tree
> and commit 0250abdeec54 ("module: add syscall to load module from fd")
> from the modules tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
>
> I do wonder why the above change in Linus' tree seems to have bypassed
> the modules maintainer.
Yes. David tacked it on to a real bugfix which went straight to Linus;
having fixed my mess I couldn't complain too much (though I had NAKed
similar patches in the past).
I will rebase my -next tree today.
Cheers,
Rusty.
prev parent reply other threads:[~2012-10-24 11:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 1:35 linux-next: manual merge of the modules tree with the tree Stephen Rothwell
2012-10-22 2:09 ` Kees Cook
2012-10-24 0:21 ` Rusty Russell [this message]
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=87vce0oh2a.fsf@rustcorp.com.au \
--to=rusty@rustcorp$(echo .)com.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox