Skip to contentSkip to conversation

bkl ioctl pushdowns for 2.6.36

GIT PULL Frederic Weisbecker 1 participant 1 message Aug 9, 2010

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the bkl/ioctl branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
bkl/ioctl

There is a merge of a recent version of your master branch inside. This is because we would like to remove the struct file_operations:ioctl callback by the end of this merge window. But we missed the new easycap driver that got merged in staging and which is one of the last that uses the ioctl callback.

Usually we would have prefered this pushdown to go through the staging tree but since I don't know if there will be another staging merge for this -rc1, I have merged your tree that has this driver and did the pushdown in my branch.

The rest of the pending bkl ioctl pushdowns are in the logfs and ecryptfs trees. If everything goes well, we'll propose a patch to remove ioctl by the end of the merge window.

Thanks,
Frederic
---

Arnd Bergmann (3):
ia64/perfmon: Convert to unlocked_ioctl
v4l: Convert v4l2-dev to unlocked_ioctl autofs/autofs4: Move compat_ioctl handling into fs

Frederic Weisbecker (1):
staging: Pushdown bkl to easycap ioctl handlers

Huang Weiyi (2):
ncpfs: Remove duplicated #include
sunrpc: Remove duplicated #include

 drivers/media/video/v4l2-dev.c          |   52 +++++++-----------------
 drivers/staging/easycap/easycap.h       |    8 +---
 drivers/staging/easycap/easycap_ioctl.c |   52 ++++++++++++++----------
 drivers/staging/easycap/easycap_main.c  |   38 +++++++++---------
 fs/autofs/root.c                        |   67 +++++++++++++++++++++++++++++-
 fs/autofs4/root.c                       |   49 ++++++++++++++++++++++
 fs/compat_ioctl.c                       |   36 ----------------
 fs/ncpfs/ioctl.c                        |    1 -
 include/linux/auto_fs.h                 |    1 +
 9 files changed, 180 insertions(+), 124 deletions(-)