]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 00:51:54 +0000 (17:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 00:51:54 +0000 (17:51 -0700)
commit20b4fb485227404329e41ad15588afad3df23050
treef3e099f0ab3da8a93b447203e294d2bb22f6dc05
parentb9394d8a657cd3c064fa432aa0905c1b58b38fe9
parentac3e3c5b1164397656df81b9e9ab4991184d3236
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull VFS updates from Al Viro,

Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).

7kloc removed.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
  don't bother with deferred freeing of fdtables
  proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
  proc: Make the PROC_I() and PDE() macros internal to procfs
  proc: Supply a function to remove a proc entry by PDE
  take cgroup_open() and cpuset_open() to fs/proc/base.c
  ppc: Clean up scanlog
  ppc: Clean up rtas_flash driver somewhat
  hostap: proc: Use remove_proc_subtree()
  drm: proc: Use remove_proc_subtree()
  drm: proc: Use minor->index to label things, not PDE->name
  drm: Constify drm_proc_list[]
  zoran: Don't print proc_dir_entry data in debug
  reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
  proc: Supply an accessor for getting the data from a PDE's parent
  airo: Use remove_proc_subtree()
  rtl8192u: Don't need to save device proc dir PDE
  rtl8187se: Use a dir under /proc/net/r8180/
  proc: Add proc_mkdir_data()
  proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
  proc: Move PDE_NET() to fs/proc/proc_net.c
  ...
103 files changed:
arch/arm/mach-omap1/pm.c
arch/mips/mm/init.c
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/irq.c
arch/s390/kernel/syscalls.S
arch/score/mm/init.c
arch/x86/ia32/ia32_aout.c
arch/x86/mm/init_64.c
arch/x86/platform/efi/efi.c
drivers/acpi/battery.c
drivers/acpi/button.c
drivers/block/cciss.c
drivers/block/loop.c
drivers/firmware/efi/efi-pstore.c
drivers/firmware/efi/efivars.c
drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb-core/dvb_net.c
drivers/media/pci/cx25821/cx25821-audio-upstream.c
drivers/media/rc/ir-lirc-codec.c
drivers/net/wireless/ath/wil6210/debugfs.c
drivers/net/wireless/ray_cs.c
drivers/of/base.c
drivers/platform/x86/thinkpad_acpi.c
drivers/pnp/pnpbios/proc.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/qla2xxx/qla_os.c
drivers/staging/csr/drv.c
drivers/staging/dgrp/dgrp_common.h
drivers/staging/dgrp/dgrp_dpa_ops.c
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/rts5139/rts51x_scsi.c
drivers/staging/rts5139/rts51x_scsi.h
drivers/staging/silicom/bpctl_mod.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6656/main_usb.c
drivers/tty/serial/serial_core.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/gadget/goku_udc.c
drivers/usb/gadget/lpc32xx_udc.c
drivers/usb/host/sl811-hcd.c
drivers/usb/storage/scsiglue.c
fs/Makefile
fs/aio.c
fs/binfmt_aout.c
fs/binfmt_elf_fdpic.c
fs/btrfs/file.c
fs/compat.c
fs/coredump.c
fs/efivarfs/file.c
fs/efivarfs/inode.c
fs/efivarfs/super.c
fs/exec.c
fs/ext4/mballoc.c
fs/ext4/super.c
fs/inode.c
fs/jbd2/journal.c
fs/namespace.c
fs/notify/inotify/inotify_user.c
fs/pnode.c
fs/pnode.h
fs/proc/base.c
fs/proc/internal.h
fs/proc/kcore.c
fs/proc/root.c
fs/read_write.c
fs/read_write.h
fs/splice.c
include/linux/cgroup.h
include/linux/cpuset.h
include/linux/fs.h
include/linux/pid_namespace.h
include/linux/signal.h
include/linux/tty.h
include/net/bluetooth/bluetooth.h
ipc/msgutil.c
ipc/util.c
kernel/cgroup.c
kernel/cpuset.c
kernel/exit.c
kernel/pid.c
kernel/pid_namespace.c
kernel/user.c
kernel/user_namespace.c
mm/filemap.c
mm/vmalloc.c
net/bluetooth/af_bluetooth.c
net/bluetooth/bnep/sock.c
net/bluetooth/cmtp/sock.c
net/bluetooth/hci_sock.c
net/bluetooth/hidp/sock.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c
net/core/neighbour.c
net/core/pktgen.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv6/proc.c
net/netfilter/x_tables.c
net/netfilter/xt_hashlimit.c
net/socket.c
net/sunrpc/cache.c