19 Apr, 2008

7 commits

  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    security: fix up documentation for security_module_enable
    Security: Introduce security= boot parameter
    Audit: Final renamings and cleanup
    SELinux: use new audit hooks, remove redundant exports
    Audit: internally use the new LSM audit hooks
    LSM/Audit: Introduce generic Audit LSM hooks
    SELinux: remove redundant exports
    Netlink: Use generic LSM hook
    Audit: use new LSM hooks instead of SELinux exports
    SELinux: setup new inode/ipc getsecid hooks
    LSM: Introduce inode_getsecid and ipc_getsecid hooks

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
    [NET]: Fix and allocate less memory for ->priv'less netdevices
    [IPV6]: Fix dangling references on error in fib6_add().
    [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
    [PKT_SCHED]: Fix datalen check in tcf_simp_init().
    [INET]: Uninline the __inet_inherit_port call.
    [INET]: Drop the inet_inherit_port() call.
    SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
    [netdrvr] forcedeth: internal simplifications; changelog removal
    phylib: factor out get_phy_id from within get_phy_device
    PHY: add BCM5464 support to broadcom PHY driver
    cxgb3: Fix __must_check warning with dev_dbg.
    tc35815: Statistics cleanup
    natsemi: fix MMIO for PPC 44x platforms
    [TIPC]: Cleanup of TIPC reference table code
    [TIPC]: Optimized initialization of TIPC reference table
    [TIPC]: Remove inlining of reference table locking routines
    e1000: convert uint16_t style integers to u16
    ixgb: convert uint16_t style integers to u16
    sb1000.c: make const arrays static
    sb1000.c: stop inlining largish static functions
    ...

    Linus Torvalds
     
  • Add the security= boot parameter. This is done to avoid LSM
    registration clashes in case of more than one bult-in module.

    User can choose a security module to enable at boot. If no
    security= boot parameter is specified, only the first LSM
    asking for registration will be loaded. An invalid security
    module name will be treated as if no module has been chosen.

    LSM modules must check now if they are allowed to register
    by calling security_module_enable(ops) first. Modify SELinux
    and SMACK to do so.

    Do not let SMACK register smackfs if it was not chosen on
    boot. Smackfs assumes that smack hooks are registered and
    the initial task security setup (swapper->security) is done.

    Signed-off-by: Ahmed S. Darwish
    Acked-by: James Morris

    Ahmed S. Darwish
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (137 commits)
    [SCSI] iscsi: bidi support for iscsi_tcp
    [SCSI] iscsi: bidi support at the generic libiscsi level
    [SCSI] iscsi: extended cdb support
    [SCSI] zfcp: Fix error handling for blocked unit for send FCP command
    [SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
    [SCSI] zfcp: fix 31 bit compile warnings
    [SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
    [SCSI] bsg: remove minor in struct bsg_device
    [SCSI] bsg: use better helper list functions
    [SCSI] bsg: replace kobject_get with blk_get_queue
    [SCSI] bsg: takes a ref to struct device in fops->open
    [SCSI] qla1280: remove version check
    [SCSI] libsas: fix endianness bug in sas_ata
    [SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
    [SCSI] aacraid: Do not describe check_reset parameter with its value
    [SCSI] aacraid: Fix down_interruptible() to check the return value
    [SCSI] sun3_scsi_vme: add MODULE_LICENSE
    [SCSI] st: rename flush_write_buffer()
    [SCSI] tgt: use KMEM_CACHE macro
    [SCSI] initio: fix big endian problems for auto request sense
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (43 commits)
    firewire: cleanups
    firewire: fix synchronization of gap counts
    firewire: wait until PHY configuration packet was transmitted (fix bus reset loop)
    firewire: remove unused struct member
    firewire: use bitwise and to get reg in handle_registers
    firewire: replace more hex values with defined csr constants
    firewire: reread config ROM when device reset the bus
    firewire: replace static ROM cache by allocated cache
    firewire: fw-ohci: work around generation bug in TI controllers (fix AV/C and more)
    firewire: fw-ohci: extend logging of bus generations and node ID
    firewire: fw-ohci: conditionally log busReset interrupts
    firewire: fw-ohci: don't append to AT context when it's not active
    firewire: fw-ohci: log regAccessFail events
    firewire: fw-ohci: make sure HCControl register LPS bit is set
    firewire: fw-ohci: missing PPC PMac feature calls in failure path
    firewire: fw-ohci: untangle a mixed unsigned/signed expression
    firewire: debug interrupt events
    firewire: fw-ohci: catch self_id_count == 0
    firewire: fw-ohci: add self ID error check
    firewire: fw-ohci: refactor probe, remove, suspend, resume
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (64 commits)
    ocfs2/net: Add debug interface to o2net
    ocfs2: Only build ocfs2/dlm with the o2cb stack module
    ocfs2/cluster: Get rid of arguments to the timeout routines
    ocfs2: Put tree in MAINTAINERS
    ocfs2: Use BUG_ON
    ocfs2: Convert ocfs2 over to unlocked_ioctl
    ocfs2: Improve rename locking
    fs/ocfs2/aops.c: test for IS_ERR rather than 0
    ocfs2: Add inode stealing for ocfs2_reserve_new_inode
    ocfs2: Add ac_alloc_slot in ocfs2_alloc_context
    ocfs2: Add a new parameter for ocfs2_reserve_suballoc_bits
    ocfs2: Enable cross extent block merge.
    ocfs2: Add support for cross extent block
    ocfs2: Move /sys/o2cb to /sys/fs/o2cb
    sysfs: Allow removal of symlinks in the sysfs root
    ocfs2: Reconnect after idle time out.
    ocfs2/dlm: Cleanup lockres print
    ocfs2/dlm: Fix lockname in lockres print function
    ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.c
    ocfs2/dlm: Dumps the purgelist into a debugfs file
    ...

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (27 commits)
    [IA64] kdump: Add crash_save_vmcoreinfo for INIT
    [IA64] Fix NUMA configuration issue
    [IA64] Itanium Spec updates
    [IA64] Untangle sync_icache_dcache() page size determination
    [IA64] arch/ia64/kernel/: use time_* macros
    [IA64] remove redundant display of free swap space in show_mem()
    [IA64] make IOMMU respect the segment boundary limits
    [IA64] kprobes: kprobe-booster for ia64
    [IA64] fix getpid and set_tid_address fast system calls for pid namespaces
    [IA64] Replace explicit jiffies tests with time_* macros.
    [IA64] use goto to jump out do/while_each_thread
    [IA64] Fix unlock ordering in smp_callin
    [IA64] pgd_offset() constfication.
    [IA64] kdump: crash.c coding style fix
    [IA64] kdump: add kdump_on_fatal_mca
    [IA64] Minimize per_cpu reservations.
    [IA64] Correct pernodesize calculation.
    [IA64] Kernel parameter for max number of concurrent global TLB purges
    [IA64] Multiple outstanding ptc.g instruction support
    [IA64] Implement smp_call_function_mask for ia64
    ...

    Linus Torvalds
     

18 Apr, 2008

21 commits

  • /sys/fs is where we really want file system specific sysfs objects.

    Ocfs2-tools has been updated to look in /sys/fs/o2cb. We can maintain
    backwards compatibility with old ocfs2-tools by using a sysfs symlink. After
    some time (2 years), the symlink can be safely removed. This patch also adds
    documentation to make it easier for people to figure out what /sys/fs/o2cb
    is used for.

    Signed-off-by: Mark Fasheh

    Mark Fasheh
     
  • Add ABI documentation for these files:

    /sys/fs/ocfs2/max_locking_protocol
    /sys/fs/ocfs2/loaded_cluster_plugins
    /sys/fs/ocfs2/active_cluster_plugin
    /sys/fs/ocfs2/cluster_stack

    Signed-off-by: Joel Becker
    Signed-off-by: Mark Fasheh

    Joel Becker
     
  • This way firewire-ohci can be used for remote debugging like ohci1394.
    Version with amendment from Fri, 11 Apr 2008 00:08:08 +0200.

    Signed-off-by: Stefan Richter
    Acked-by: Bernhard Kaindl

    Stefan Richter
     
  • * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (87 commits)
    [XFS] Fix merge failure
    [XFS] The forward declarations for the xfs_ioctl() helpers and the
    [XFS] Update XFS documentation for noikeep/ikeep.
    [XFS] Update XFS Documentation for ikeep and ihashsize
    [XFS] Remove unused HAVE_SPLICE macro.
    [XFS] Remove CONFIG_XFS_SECURITY.
    [XFS] xfs_bmap_compute_maxlevels should be based on di_forkoff
    [XFS] Always use di_forkoff when checking for attr space.
    [XFS] Ensure the inode is joined in xfs_itruncate_finish
    [XFS] Remove periodic logging of in-core superblock counters.
    [XFS] fix logic error in xfs_alloc_ag_vextent_near()
    [XFS] Don't error out on good I/Os.
    [XFS] Catch log unmount failures.
    [XFS] Sanitise xfs_log_force error checking.
    [XFS] Check for errors when changing buffer pointers.
    [XFS] Don't allow silent errors in xfs_inactive().
    [XFS] Catch errors from xfs_imap().
    [XFS] xfs_bulkstat_one_dinode() never returns an error.
    [XFS] xfs_iflush_fork() never returns an error.
    [XFS] Catch unwritten extent conversion errors.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (58 commits)
    ide: remove ide_init_default_irq() macro
    ide: move default IDE ports setup to ide_generic host driver
    ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
    ide: remove needless hwif->irq check from ide_hwif_configure()
    ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
    ide: limit legacy VLB host drivers to alpha, x86 and mips
    cmd640: init hwif->{io_ports,irq} explicitly
    cmd640: cleanup setup_device_ptrs()
    ide: add ide-4drives host driver (take 3)
    ide: remove ppc ifdef from init_ide_data()
    ide: remove ide_default_io_ctl() macro
    ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT
    ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
    ppc/pmac: remove no longer needed IDE quirk
    ppc: don't include
    ppc: remove ppc_ide_md
    ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
    ppc/sandpoint: remove ppc_ide_md hooks
    ppc/lopec: remove ppc_ide_md hooks
    ppc/mpc8xx: remove ppc_ide_md hooks
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
    clocksource: make clocksource watchdog cycle through online CPUs
    Documentation: move timer related documentation to a single place
    clockevents: optimise tick_nohz_stop_sched_tick() a bit
    locking: remove unused double_spin_lock()
    hrtimers: simplify lockdep handling
    timers: simplify lockdep handling
    posix-timers: fix shadowed variables
    timer_list: add annotations to workqueue.c
    hrtimer: use nanosleep specific restart_block fields
    hrtimer: add nanosleep specific restart_block member

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
    kgdb: always use icache flush for sw breakpoints
    kgdb: fix SMP NMI kgdb_handle_exception exit race
    kgdb: documentation fixes
    kgdb: allow static kgdbts boot configuration
    kgdb: add documentation
    kgdb: Kconfig fix
    kgdb: add kgdb internal test suite
    kgdb: fix several kgdb regressions
    kgdb: kgdboc pl011 I/O module
    kgdb: fix optional arch functions and probe_kernel_*
    kgdb: add x86 HW breakpoints
    kgdb: print breakpoint removed on exception
    kgdb: clocksource watchdog
    kgdb: fix NMI hangs
    kgdb: fix kgdboc dynamic module configuration
    kgdb: document parameters
    x86: kgdb support
    consoles: polling support, kgdboc
    kgdb: core
    uaccess: add probe_kernel_write()

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
    x86: standalone trampoline code
    x86: move suspend wakeup code to C
    x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
    x86: setup_trampoline() - fix section mismatch warning
    x86: section mismatch fixes, #1
    x86: fix paranoia about using BIOS quickboot mechanism.
    x86: print out buggy mptable
    x86: use cpu_online()
    x86: use cpumask_of_cpu()
    x86: remove unnecessary tmp local variable
    x86: remove unnecessary memset()
    x86: use ioapic_read_entry() and ioapic_write_entry()
    x86: avoid redundant loop in io_apic_level_ack_pending()
    x86: remove superfluous initialisation in boot code.
    x86: merge mpparse_{32,64}.c
    x86: unify mp_register_gsi
    x86: unify mp_config_acpi_legacy_irqs
    x86: unify mp_register_ioapic
    x86: unify uniq_io_apic_id
    x86: unify smp_scan_config
    ...

    Linus Torvalds
     
  • David S. Miller
     
  • Mention how DMAPI affects default for noikeep.
    Slightly modified since Josef's patch was based on
    an old xfs.txt prior to Dave's (dgc) checkin which
    missed going to oss.

    Signed-off-by: Josef Sipek
    Signed-off-by: Tim Shimmin

    Josef Sipek
     
  • Update xfs docs for:
    * In memory inode hashes has been removed.
    * noikeep is now the default.

    SGI-PV: 969561
    SGI-Modid: 2.6.x-xfs-melb:linux:29481b

    Signed-off-by: David Chinner
    Signed-off-by: Christoph Hellwig
    Signed-off-by: Tim Shimmin

    David Chinner
     
  • * Remove obsoleted "idex=noprobe" kernel parameter.

    * Remove no longer needed hwif->noprobe quirk from ide_hwif_configure()
    and hwif->noprobe checking from cmd640.c.

    v2:
    * "ide?=noprobe" -> "ide?=ata66" in Documentation/kernel-parameters.txt.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • CONFIG_BLK_DEV_4DRIVES deserves its own host driver:

    * Add drivers/ide/legacy/ide-4drives.c and move "4drives" support there.

    * Add ide-4drives.o in the link order after all other legacy host
    drivers enabled by "ide0=" options (they all are mutually exclusive).

    * Make ide-4drives host driver probe itself for IDE devices instead of
    indirectly depending on ide_generic host driver.

    * Add "probe" module parameter to ide-4drives and update documentation.

    v2:
    * s/paramater/parameter/ in ide.txt. (Noticed by Randy Dunlap)

    v3:
    * s/ide_4drives.probe/ide-4drives.probe/ in help entry.
    (Noticed by Sergei Shtylyov)

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Remove obsoleted "idex=base[,ctl[,irq]]" kernel parameters
    and update Documentation/ide/ide.txt.

    * Remove no longer needed ide_forced chipset type.

    v2:
    * is_chipset_set[] -> is_chipset_set in ide.c.

    * Documentation/ide/ide.txt fix.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Remove CONFIG_BLK_DEV_HD hack from init_hwif_default()
    ("hda=noprobe hdb=noprobe" kernel parameters should be used
    instead if somebody wishes to use the old "hd" driver).

    * Make CONFIG_BLK_DEV_HD_ONLY config option available also when
    IDE subsystem is used and update help entry.

    * Remove no longer needed CONFIG_BLK_DEV_HD_IDE config option.

    v2:
    * Update documentation to suggest "hda=noprobe hdb=noprobe"
    instead of obsoleted "ide0=noprobe".

    * Update Documentation/ide/ide.txt.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Add 'struct class ide_port_class' ('ide_port' class) and a 'struct
    device *portdev' ('ide_port' class device) in ide_hwif_t.

    * Register 'ide_port' class in ide_init() and unregister it in
    cleanup_module().

    * Create ->portdev in ide_register_port () and unregister it in
    ide_unregister().

    * Add "delete_devices" class device attribute for unregistering IDE devices
    on a port and "scan" one for probing+registering IDE devices on a port.

    * Add ide_sysfs_register_port() helper for registering "delete_devices"
    and "scan" attributes with ->portdev. Call it in ide_device_add_all().

    * Document IDE warm-plug support in Documentation/ide/warm-plug-howto.txt.

    v2:
    * Convert patch from using 'struct class_device' to use 'struct device'.
    (thanks to Kay Sievers for doing it)

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • This option is obsolete and can be removed safely.

    It allows us to remove the pci_get_device_reverse() function from the
    PCI core.

    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Greg Kroah-Hartman
     
  • Minor cleanups to kgdb docs.

    Signed-off-by: Jason Wessel
    Signed-off-by: Ingo Molnar

    Jason Wessel
     
  • Add in the kgdb documentation for kgdb.

    Signed-off-by: Jason Wessel
    Signed-off-by: Ingo Molnar

    Jason Wessel
     
  • document the kgdboc module/boot parameter.

    Signed-off-by: Jason Wessel
    Signed-off-by: Jan Kiszka
    Signed-off-by: Ingo Molnar

    Jason Wessel
     
  • Conflicts:

    arch/ia64/mm/tlb.c

    Tony Luck
     

17 Apr, 2008

10 commits


16 Apr, 2008

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    [TCP]: Add return value indication to tcp_prune_ofo_queue().
    PS3: gelic: fix the oops on the broken IE returned from the hypervisor
    b43legacy: fix DMA mapping leakage
    mac80211: remove message on receiving unexpected unencrypted frames
    Update rt2x00 MAINTAINERS entry
    Add rfkill to MAINTAINERS file
    rfkill: Fix device type check when toggling states
    b43legacy: Fix usage of struct device used for DMAing
    ssb: Fix usage of struct device used for DMAing
    MAINTAINERS: move to generic repository for iwlwifi
    b43legacy: fix initvals loading on bcm4303
    rtl8187: Add missing priv->vif assignments
    netconsole: only set CON_PRINTBUFFER if the user specifies a netconsole
    [CAN]: Update documentation of struct sockaddr_can
    MAINTAINERS: isdn4linux@listserv.isdn4linux.de is subscribers-only
    [TCP]: Fix never pruned tcp out-of-order queue.
    [NET_SCHED] sch_api: fix qdisc_tree_decrease_qlen() loop

    Linus Torvalds
     
  • As shown by Gurudas Pai recently, we can put hugepages into the surplus
    state (by echo 0 > /proc/sys/vm/nr_hugepages), even when
    /proc/sys/vm/nr_overcommit_hugepages is 0. This is actually correct, to
    allow the original goal (shrink the static pool to 0) to succeed (we are
    converting hugepages to surplus because they are in use). However, the
    documentation does not accurately reflect this case. Update it.

    Signed-off-by: Nishanth Aravamudan
    Acked-by: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nishanth Aravamudan