From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "\"Frédéric Weisbecker\"" <fweisbec@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Arnd Bergmann <arnd@arndb•de>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
Date: Tue, 27 Apr 2010 15:06:04 +1000 [thread overview]
Message-ID: <20100427150604.2ad0b3fe.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got conflicts in
drivers/char/i8k.c, net/sunrpc/cache.c and
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.
I used the versions from the bkl-procfs tree for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-04-27 5:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 5:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-27 5:06 linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree Stephen Rothwell
2010-04-27 5:18 ` Frederic Weisbecker
2010-04-29 5:49 Stephen Rothwell
2010-04-29 20:59 ` Frederic Weisbecker
2010-04-29 5:50 Stephen Rothwell
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=20100427150604.2ad0b3fe.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=fweisbec@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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