1. 21 5月, 2011 20 次提交
    • F
      ipv6: copy prefsrc setting when copying route entry · 0f6c6392
      Florian Westphal 提交于
      commit c3968a85
      ('ipv6: RTA_PREFSRC support for ipv6 route source address selection')
      added support for ipv6 prefsrc as an alternative to ipv6 addrlabels,
      but it did not work because the prefsrc entry was not copied.
      
      Cc: Daniel Walter <sahne@0x90.at>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0f6c6392
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 557eed60
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: Power off empty ports
        libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
        ATA: Don't powerdown Compaq Triflex IDE device on suspend
        libata: Use Maximum Write Same Length to report discard size limit
        drivers/ata/acard-ahci.c: fix enum warning
        pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
        libata-sff: prevent irq descriptions for dummy ports
        pata_cm64x: fix boot crash on parisc
      557eed60
    • K
      ipc: Add missing sys_ni entries for ipc/compat.c functions · be84bfcc
      Kevin Cernekee 提交于
      When building with:
      
        CONFIG_64BIT=y
        CONFIG_MIPS32_COMPAT=y
        CONFIG_COMPAT=y
        CONFIG_MIPS32_O32=y
        CONFIG_MIPS32_N32=y
        CONFIG_SYSVIPC is not set
        (and implicitly: CONFIG_SYSVIPC_COMPAT is not set)
      
      the final link fails with unresolved symbols for:
      
        compat_sys_semctl, compat_sys_msgsnd, compat_sys_msgrcv,
        compat_sys_shmctl, compat_sys_msgctl, compat_sys_semtimedop
      
      The fix is to add cond_syscall declarations for all syscalls in
      ipc/compat.c
      Signed-off-by: NKevin Cernekee <cernekee@gmail.com>
      Acked-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      be84bfcc
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 06f4e926
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
        macvlan: fix panic if lowerdev in a bond
        tg3: Add braces around 5906 workaround.
        tg3: Fix NETIF_F_LOOPBACK error
        macvlan: remove one synchronize_rcu() call
        networking: NET_CLS_ROUTE4 depends on INET
        irda: Fix error propagation in ircomm_lmp_connect_response()
        irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
        irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
        rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
        be2net: Kill set but unused variable 'req' in lancer_fw_download()
        irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
        atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
        rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
        rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
        rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
        rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
        pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
        isdn: capi: Use pr_debug() instead of ifdefs.
        tg3: Update version to 3.119
        tg3: Apply rx_discards fix to 5719/5720
        ...
      
      Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
      as per Davem.
      06f4e926
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 8e7bfcba
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] define "_sdata" symbol
        pstore: Fix Kconfig dependencies for apei->pstore
        pstore: fix potential logic issue in pstore read interface
        pstore: fix pstore filesystem mount/remount issue
        pstore: fix one type of return value in pstore
        [IA64] fix build warning in arch/ia64/oprofile/backtrace.c
      8e7bfcba
    • L
      Merge branch 'timers-fixes-for-linus' of... · 102dc1ba
      Linus Torvalds 提交于
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
        clockevents/source: Use u64 to make 32bit happy
      102dc1ba
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 91444f47
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (32 commits)
        [CIFS] Fix to problem with getattr caused by invalidate simplification patch
        [CIFS] Remove sparse warning
        [CIFS] Update cifs to version 1.72
        cifs: Change key name to cifs.idmap, misc. clean-up
        cifs: Unconditionally copy mount options to superblock info
        cifs: Use kstrndup for cifs_sb->mountdata
        cifs: Simplify handling of submount options in cifs_mount.
        cifs: cifs_parse_mount_options: do not tokenize mount options in-place
        cifs: Add support for mounting Windows 2008 DFS shares
        cifs: Extract DFS referral expansion logic to separate function
        cifs: turn BCC into a static inlined function
        cifs: keep BCC in little-endian format
        cifs: fix some unused variable warnings in id_rb_search
        CIFS: Simplify invalidate part (try #5)
        CIFS: directio read/write cleanups
        consistently use smb_buf_length as be32 for cifs (try 3)
        cifs: Invoke id mapping functions (try #17 repost)
        cifs: Add idmap key and related data structures and functions (try #17 repost)
        CIFS: Add launder_page operation (try #3)
        Introduce smb2 mounts as vers=2
        ...
      91444f47
    • L
      Merge branch 'perf-urgent-for-linus' of... · bc091c93
      Linus Torvalds 提交于
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        extable, core_kernel_data(): Make sure all archs define _sdata
        core_kernel_data(): Fix architectures that do not define _sdata
      bc091c93
    • L
      Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 3ed4c058
      Linus Torvalds 提交于
      * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)
        signal: trivial, fix the "timespec declared inside parameter list" warning
        job control: reorganize wait_task_stopped()
        ptrace: fix signal->wait_chldexit usage in task_clear_group_stop_trapping()
        signal: sys_sigprocmask() needs retarget_shared_pending()
        signal: cleanup sys_sigprocmask()
        signal: rename signandsets() to sigandnsets()
        signal: do_sigtimedwait() needs retarget_shared_pending()
        signal: introduce do_sigtimedwait() to factor out compat/native code
        signal: sys_rt_sigtimedwait: simplify the timeout logic
        signal: cleanup sys_rt_sigprocmask()
        x86: signal: sys_rt_sigreturn() should use set_current_blocked()
        x86: signal: handle_signal() should use set_current_blocked()
        signal: sigprocmask() should do retarget_shared_pending()
        signal: sigprocmask: narrow the scope of ->siglock
        signal: retarget_shared_pending: optimize while_each_thread() loop
        signal: retarget_shared_pending: consider shared/unblocked signals only
        signal: introduce retarget_shared_pending()
        ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/
        signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED
        signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()
        ...
      3ed4c058
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ad947175
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)
        [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.
        [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.
        [SCSI] qla2xxx: Clear complete initialization control block.
        [SCSI] qla2xxx: Allow an override of the registered maximum LUN.
        [SCSI] qla2xxx: Add host number in reset and quiescent message logs.
        [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.
        [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.
        [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.
        [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function
        [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.
        [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.
        [SCSI] qla2xxx: Fix hang during driver unload when vport is active.
        [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.
        [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.
        [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
        [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)
        [SCSI] ipr: Rate limit DMA mapping errors
        [SCSI] hpsa: add P2000 to list of shared SAS devices
        [SCSI] hpsa: do not attempt PCI power management reset method if we know it won't work.
        [SCSI] hpsa: remove superfluous sleeps around reset code
        ...
      ad947175
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 6c1b8d94
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (32 commits)
        GFS2: Move all locking inside the inode creation function
        GFS2: Clean up symlink creation
        GFS2: Clean up mkdir
        GFS2: Use UUID field in generic superblock
        GFS2: Rename ops_inode.c to inode.c
        GFS2: Inode.c is empty now, remove it
        GFS2: Move final part of inode.c into super.c
        GFS2: Move most of the remaining inode.c into ops_inode.c
        GFS2: Move gfs2_refresh_inode() and friends into glops.c
        GFS2: Remove gfs2_dinode_print() function
        GFS2: When adding a new dir entry, inc link count if it is a subdir
        GFS2: Make gfs2_dir_del update link count when required
        GFS2: Don't use gfs2_change_nlink in link syscall
        GFS2: Don't use a try lock when promoting to a higher mode
        GFS2: Double check link count under glock
        GFS2: Improve bug trap code in ->releasepage()
        GFS2: Fix ail list traversal
        GFS2: make sure fallocate bytes is a multiple of blksize
        GFS2: Add an AIL writeback tracepoint
        GFS2: Make writeback more responsive to system conditions
        ...
      6c1b8d94
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 82aff107
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
        powerpc: Fix hard CPU IDs detection
        powerpc/pmac: Update via-pmu to new syscore_ops
        powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
        powerpc/kvm: Fix kvmppc_core_pending_dec
        powerpc: Remove last piece of GEMINI
        powerpc: Fix for Pegasos keyboard and mouse
        powerpc: Make early memory scan more resilient to out of order nodes
        powerpc/pseries/iommu: Cleanup ddw naming
        powerpc/pseries/iommu: Find windows after kexec during boot
        powerpc/pseries/iommu: Remove ddw property when destroying window
        powerpc/pseries/iommu: Add additional checks when changing iommu mask
        powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
        powerpc: Remove unused/obsolete CONFIG_XICS
        misc: Add CARMA DATA-FPGA Programmer support
        misc: Add CARMA DATA-FPGA Access Driver
        powerpc: Make IRQ_NOREQUEST last to clear, first to set
        powerpc: Integrated Flash controller device tree bindings
        powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
        powerpc/85xx: Fix PCIe IDSEL for Px020RDB
        powerpc/85xx: P2020 DTS: re-organize dts files
        ...
      82aff107
    • S
      spinlock_up.h: include asm/processor.h in for cpu_relax · d974d905
      Stephen Rothwell 提交于
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h and this was a
      path to including asm/processor.h.  We need to include it excplicitly
      now.
      
      Fixes this build error on sparc32 (at least):
      
        In file included from include/linux/seqlock.h:29,
                         from include/linux/time.h:8,
                         from include/linux/timex.h:56,
                         from include/linux/sched.h:57,
                         from arch/sparc/kernel/asm-offsets.c:13:
        include/linux/spinlock.h: In function 'spin_unlock_wait':
        include/linux/spinlock.h:360: error: implicit declaration of function 'cpu_relax
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d974d905
    • L
      sanitize <linux/prefetch.h> usage · 268bb0ce
      Linus Torvalds 提交于
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h, which
      uncovered several cases that had apparently relied on that rather
      obscure header file dependency.
      
      So this fixes things up a bit, using
      
         grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
         grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')
      
      to guide us in finding files that either need <linux/prefetch.h>
      inclusion, or have it despite not needing it.
      
      There are more of them around (mostly network drivers), but this gets
      many core ones.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      268bb0ce
    • E
      macvlan: fix panic if lowerdev in a bond · d9351561
      Eric Dumazet 提交于
      commit a35e2c1b (macvlan: use rx_handler_data pointer to store
      macvlan_port pointer V2) added a bug in macvlan_port_create()
      
      Steps to reproduce the bug:
      
      # ifenslave bond0 eth0 eth1
      
      # ip link add link eth0 up name eth0#1 type macvlan
      ->error EBUSY
      
      # ip link add link eth0 up name eth0#1 type macvlan
      ->panic
      
      
      Fix: Dont set IFF_MACVLAN_PORT in error case.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d9351561
    • T
      [IA64] define "_sdata" symbol · 30f7276c
      Tony Luck 提交于
      core_kernel_data() wants to know if an address looks like kernel
      data. IA64 has had _edata forever, but never needed _sdata until
      now.
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      30f7276c
    • T
      Pull misc-2.6.40 into release branch · 5e4de22b
      Tony Luck 提交于
      5e4de22b
    • T
      Pull pstore into release branch · 3935bb94
      Tony Luck 提交于
      3935bb94
    • L
      pstore: Fix Kconfig dependencies for apei->pstore · 5d2a8342
      Luck, Tony 提交于
      Geert Uytterhoeven ran a dependency checker which kicked out this warning:
      
      + warning: (ACPI_APEI) selects PSTORE which has unmet direct dependencies (MISC_FILESYSTEMS):  => N/A
      
      Randy confirmed that the fix was to "select MISC_FILESYSTEMS" too.
      Tested-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      5d2a8342
    • S
      [CIFS] Fix to problem with getattr caused by invalidate simplification patch · 156ecb2d
      Steve French 提交于
      Fix to earlier "Simplify invalidate part (try #6)" patch
      That patch caused problems with connectathon test 5.
      Reviewed-by: NJeff Layton <jlayton@samba.org>
      Signed-off-by: NPavel Shilovsky <piastry@etersoft.ru>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      156ecb2d
  2. 20 5月, 2011 20 次提交