From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org,
Gerald Schaefer <gerald.schaefer@de•ibm.com>,
Martin Schwidefsky <schwidefsky@de•ibm.com>
Subject: linux-next: manual merge of the bkl-removal tree
Date: Tue, 1 Jul 2008 19:45:44 +1000 [thread overview]
Message-ID: <20080701194544.f2109cdd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi Jonathan,
Today's linux-next merge of the bkl-removal tree got a conflict in
drivers/s390/char/monreader.c between commit
4b45ec0706ac12bf0c790747e55b4f3fec776c7a ("[S390] Cleanup monreader
printk messages.") from the s390 tree and commit
167ae8a4822ed405037e72d660acf3294ab32807 ("monreader: BKL pushdown") from
the bkl-removal tree.
Just a matter of overlapping additions. I can carry it.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-01 9:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 9:45 Stephen Rothwell [this message]
2008-07-02 21:10 ` linux-next: manual merge of the bkl-removal tree Jonathan Corbet
2008-07-03 5:39 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-06-30 8:21 Stephen Rothwell
2008-06-30 22:51 ` Jonathan Corbet
2008-07-01 16:05 ` Chuck Lever
2008-06-16 6:50 Stephen Rothwell
2008-06-19 20:51 ` Jonathan Corbet
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=20080701194544.f2109cdd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=gerald.schaefer@de$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
/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