1. 30 Dec, 2008 15 commits
  2. 29 Dec, 2008 4 commits
  3. 28 Dec, 2008 21 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · d05a788f
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
        smackfs: check for allocation failures in smk_set_access()
      d05a788f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next · 96faec94
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25 commits)
        allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
        kbuild: strip generated symbols from *.ko
        kbuild: simplify use of genksyms
        kernel-doc: check for extra kernel-doc notations
        kbuild: add headerdep used to detect inclusion cycles in header files
        kbuild: fix string equality testing in tags.sh
        kbuild: fix make tags/cscope
        kbuild: fix make incompatibility
        kbuild: remove TAR_IGNORE
        setlocalversion: add git-svn support
        setlocalversion: print correct subversion revision
        scripts: improve the decodecode script
        scripts/package: allow custom options to rpm
        genksyms: allow to ignore symbol checksum changes
        genksyms: track symbol checksum changes
        tags and cscope support really belongs in a shell script
        kconfig: fix options to check-lxdialog.sh
        kbuild: gen_init_cpio expands shell variables in file names
        remove bashisms from scripts/extract-ikconfig
        kbuild: teach mkmakfile to be silent
        ...
      96faec94
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram · 29263285
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram:
        [PATCH] nvram - convert PRINT_PROC to seq_file
        [PATCH] nvram - CodingStyle
      29263285
    • James Morris's avatar
      Merge branch 'next' into for-linus · 54d2f649
      James Morris authored
      54d2f649
    • Ilya Yanok's avatar
      powerpc/44x: Support 16K/64K base page sizes on 44x · ca9153a3
      Ilya Yanok authored
      This adds support for 16k and 64k page sizes on PowerPC 44x processors.
      
      The PGDIR table is much smaller than a page when using 16k or 64k
      pages (512 and 32 bytes respectively) so we allocate the PGDIR with
      kzalloc() instead of __get_free_pages().
      
      One PTE table covers rather a large memory area when using 16k or 64k
      pages (32MB or 512MB respectively), so we can easily put FIXMAP and
      PKMAP in the area covered by one PTE table.
      Signed-off-by: default avatarYuri Tikhonov <yur@emcraft.com>
      Signed-off-by: default avatarVladimir Panfilov <pvr@emcraft.com>
      Signed-off-by: default avatarIlya Yanok <yanok@emcraft.com>
      Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      ca9153a3
    • Hollis Blanchard's avatar
      powerpc: Force memory size to be a multiple of PAGE_SIZE · 6ca4f749
      Hollis Blanchard authored
      Ensure that total memory size is page-aligned, because otherwise
      mark_bootmem() gets upset.
      
      This error case was triggered by using 64 KiB pages in the kernel
      while arch/powerpc/boot/4xx.c arbitrarily reduced the amount of memory
      by 4096 (to work around a chip bug that affects the last 256 bytes of
      physical memory).
      Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      6ca4f749
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 541ef5cb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: use the new byteorder headers
        fbcon: Protect free_irq() by MACH_IS_ATARI check
        fbcon: remove broken mac vbl handler
        m68k: fix trigraph ignored warning in setox.S
        macfb annotations and compiler warning fix
        m68k: mac baboon interrupt enable/disable
        m68k: machw.h cleanup
        m68k: Mac via cleanup and commentry
        m68k: Reinstate mac rtc
      541ef5cb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 0191b625
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
        net: Allow dependancies of FDDI & Tokenring to be modular.
        igb: Fix build warning when DCA is disabled.
        net: Fix warning fallout from recent NAPI interface changes.
        gro: Fix potential use after free
        sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
        sfc: When disabling the NIC, close the device rather than unregistering it
        sfc: SFT9001: Add cable diagnostics
        sfc: Add support for multiple PHY self-tests
        sfc: Merge top-level functions for self-tests
        sfc: Clean up PHY mode management in loopback self-test
        sfc: Fix unreliable link detection in some loopback modes
        sfc: Generate unique names for per-NIC workqueues
        802.3ad: use standard ethhdr instead of ad_header
        802.3ad: generalize out mac address initializer
        802.3ad: initialize ports LACPDU from const initializer
        802.3ad: remove typedef around ad_system
        802.3ad: turn ports is_individual into a bool
        802.3ad: turn ports is_enabled into a bool
        802.3ad: make ntt bool
        ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
        ...
      
      Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
      to the conversion to %pI (in this networking merge) and the addition of
      doing IPv6 addresses (from the earlier merge of CIFS).
      0191b625
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 54a696bd
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (31 commits)
        [CIFS] Remove redundant test
        [CIFS] make sure that DFS pathnames are properly formed
        Remove an already-checked error condition in SendReceiveBlockingLock
        Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
        Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
        [CIFS] Streamline SendReceive[2] by using "goto out:" in an error condition
        Slightly streamline SendReceive[2]
        Check the return value of cifs_sign_smb[2]
        [CIFS] Cleanup: Move the check for too large R/W requests
        [CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary "else" branch
        Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
        [CIFS] In SendReceive, move consistency check out of the mutexed region
        cifs: store password in tcon
        cifs: have calc_lanman_hash take more granular args
        cifs: zero out session password before freeing it
        cifs: fix wait_for_response to time out sleeping processes correctly
        [CIFS] Can not mount with prefixpath if root directory of share is inaccessible
        [CIFS] various minor cleanups pointed out by checkpatch script
        [CIFS] fix typo
        [CIFS] remove sparse warning
        ...
      
      Fix trivial conflict in fs/cifs/cifs_fs_sb.h due to comment changes for
      the CIFS_MOUNT_xyz bit definitions between cifs updates and security
      updates.
      54a696bd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 1d248b25
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
        IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
        RDMA/nes: Remove tx_free_list
        RDMA/cma: Add IPv6 support
        RDMA/addr: Add support for translating IPv6 addresses
        mlx4_core: Delete incorrect comment
        mlx4_core: Add support for multiple completion event vectors
        IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
        IB/ehca: Remove redundant test of vpage
        IB/ehca: Replace modulus operations in flush error completion path
        IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
        IB/ipath: Fix spi_pioindex value
        IB/ipath: Only do 1X workaround on rev1 chips
        IB/ipath: Don't count IB symbol and link errors unless link is UP
        IB/ipath: Check return value of dma_map_single()
        IB/ipath: Fix PSN of send WQEs after an RDMA read resend
        RDMA/nes: Cleanup warnings
        RDMA/nes: Add loopback check to make_cm_node()
        RDMA/nes: Check cqp_avail_reqs is empty after locking the list
        RDMA/nes: Fix TCP compliance test failures
        RDMA/nes: Forward packets for a new connection with stale APBVT entry
        ...
      1d248b25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 1db2a5c1
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (85 commits)
        [S390] provide documentation for hvc_iucv kernel parameter.
        [S390] convert ctcm printks to dev_xxx and pr_xxx macros.
        [S390] convert zfcp printks to pr_xxx macros.
        [S390] convert vmlogrdr printks to pr_xxx macros.
        [S390] convert zfcp dumper printks to pr_xxx macros.
        [S390] convert cpu related printks to pr_xxx macros.
        [S390] convert qeth printks to dev_xxx and pr_xxx macros.
        [S390] convert sclp printks to pr_xxx macros.
        [S390] convert iucv printks to dev_xxx and pr_xxx macros.
        [S390] convert ap_bus printks to pr_xxx macros.
        [S390] convert dcssblk and extmem printks messages to pr_xxx macros.
        [S390] convert monwriter printks to pr_xxx macros.
        [S390] convert s390 debug feature printks to pr_xxx macros.
        [S390] convert monreader printks to pr_xxx macros.
        [S390] convert appldata printks to pr_xxx macros.
        [S390] convert setup printks to pr_xxx macros.
        [S390] convert hypfs printks to pr_xxx macros.
        [S390] convert time printks to pr_xxx macros.
        [S390] convert cpacf printks to pr_xxx macros.
        [S390] convert cio printks to pr_xxx macros.
        ...
      1db2a5c1
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · a39b8633
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
        sched: fix warning in fs/proc/base.c
        schedstat: consolidate per-task cpu runtime stats
        sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
        sched, cpuacct: export percpu cpuacct cgroup stats
        sched, cpuacct: refactoring cpuusage_read / cpuusage_write
        sched: optimize update_curr()
        sched: fix wakeup preemption clock
        sched: add missing arch_update_cpu_topology() call
        sched: let arch_update_cpu_topology indicate if topology changed
        sched: idle_balance() does not call load_balance_newidle()
        sched: fix sd_parent_degenerate on non-numa smp machine
        sched: add uid information to sched_debug for CONFIG_USER_SCHED
        sched: move double_unlock_balance() higher
        sched: update comment for move_task_off_dead_cpu
        sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
        sched/rt: removed unneeded defintion
        sched: add hierarchical accounting to cpu accounting controller
        sched: include group statistics in /proc/sched_debug
        sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER
        sched: clean up SCHED_CPUMASK_ALLOC
        ...
      a39b8633
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · b0f4b285
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)
        sched, trace: update trace_sched_wakeup()
        tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
        Revert "x86: disable X86_PTRACE_BTS"
        ring-buffer: prevent false positive warning
        ring-buffer: fix dangling commit race
        ftrace: enable format arguments checking
        x86, bts: memory accounting
        x86, bts: add fork and exit handling
        ftrace: introduce tracing_reset_online_cpus() helper
        tracing: fix warnings in kernel/trace/trace_sched_switch.c
        tracing: fix warning in kernel/trace/trace.c
        tracing/ring-buffer: remove unused ring_buffer size
        trace: fix task state printout
        ftrace: add not to regex on filtering functions
        trace: better use of stack_trace_enabled for boot up code
        trace: add a way to enable or disable the stack tracer
        x86: entry_64 - introduce FTRACE_ frame macro v2
        tracing/ftrace: add the printk-msg-only option
        tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp()
        x86, bts: correctly report invalid bts records
        ...
      
      Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits
      being already partly merged by the SH merge.
      b0f4b285
    • Linus Torvalds's avatar
      Merge branch 'x86-core-for-linus' of... · be9c5ae4
      Linus Torvalds authored
      Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
        x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
        x86: PAT: fix address types in track_pfn_vma_new()
        x86: prioritize the FPU traps for the error code
        x86: PAT: pfnmap documentation update changes
        x86: PAT: move track untrack pfnmap stubs to asm-generic
        x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
        x86: PAT: modify follow_phys to return phys_addr prot and return value
        x86: PAT: clarify is_linear_pfn_mapping() interface
        x86: ia32_signal: remove unnecessary declaration
        x86: common.c boot_cpu_stack and boot_exception_stacks should be static
        x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
        x86: fix warning in arch/x86/kernel/microcode_amd.c
        x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
        x86: asm-offset_64: use rt_sigframe_ia32
        x86: sigframe.h: include headers for dependency
        x86: traps.c declare functions before they get used
        x86: PAT: update documentation to cover pgprot and remap_pfn related changes - v3
        x86: PAT: add pgprot_writecombine() interface for drivers - v3
        x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
        x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
        ...
      be9c5ae4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · bb26c6c2
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (105 commits)
        SELinux: don't check permissions for kernel mounts
        security: pass mount flags to security_sb_kern_mount()
        SELinux: correctly detect proc filesystems of the form "proc/foo"
        Audit: Log TIOCSTI
        user namespaces: document CFS behavior
        user namespaces: require cap_set{ug}id for CLONE_NEWUSER
        user namespaces: let user_ns be cloned with fairsched
        CRED: fix sparse warnings
        User namespaces: use the current_user_ns() macro
        User namespaces: set of cleanups (v2)
        nfsctl: add headers for credentials
        coda: fix creds reference
        capabilities: define get_vfs_caps_from_disk when file caps are not enabled
        CRED: Allow kernel services to override LSM settings for task actions
        CRED: Add a kernel_service object class to SELinux
        CRED: Differentiate objective and effective subjective credentials on a task
        CRED: Documentation
        CRED: Use creds in file structs
        CRED: Prettify commoncap.c
        CRED: Make execve() take advantage of copy-on-write credentials
        ...
      bb26c6c2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · e14e61e9
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (57 commits)
        crypto: aes - Precompute tables
        crypto: talitos - Ack done interrupt in isr instead of tasklet
        crypto: testmgr - Correct comment about deflate parameters
        crypto: salsa20 - Remove private wrappers around various operations
        crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
        crypto: sha512 - Switch to shash 
        crypto: sha512 - Move message schedule W[80] to static percpu area
        crypto: michael_mic - Switch to shash
        crypto: wp512 - Switch to shash
        crypto: tgr192 - Switch to shash
        crypto: sha256 - Switch to shash
        crypto: md5 - Switch to shash
        crypto: md4 - Switch to shash
        crypto: sha1 - Switch to shash
        crypto: rmd320 - Switch to shash
        crypto: rmd256 - Switch to shash
        crypto: rmd160 - Switch to shash
        crypto: rmd128 - Switch to shash
        crypto: null - Switch to shash
        crypto: hash - Make setkey optional
        ...
      e14e61e9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · cb10ea54
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
        ALSA: ASoC: fix a typo in omp-pcm.c
        ASoC: Fix DSP formats in SSM2602 audio codec
        ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
        ALSA: hda: fix incorrect mixer index values for 92hd83xx
        ALSA: hda: dinput_mux check
        ALSA: hda - Add quirk for another HP dv7
        ALSA: ASoC - Add missing __devexit annotation to wm8350.c
        ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
        ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
        ALSA: ASoC: tlv320aic3x add dsp_a
        ALSA: ASoC: DaVinci: document I2S limitations
        ALSA: ASoC: DaVinci: davinci-i2s clean up
        ALSA: ASoC: DaVinci: davinci-i2s clean up
        ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
        ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
        ALSA: ca0106 - disable 44.1kHz capture
        ALSA: ca0106 - Add missing card->private_data initialization
        ALSA: ca0106 - Check ac97 availability at PM
        ALSA: hda - Power up always when no jack detection is available
        ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
        ...
      cb10ea54
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 81d6e59d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (132 commits)
        sh: oprofile: Fix up the module build.
        sh: add UIO support for JPU on SH7722.
        serial: sh-sci: Fix up port pinmux for SH7366.
        sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
        sh: mach-sh03: Fix up pata_platform build breakage.
        sh: enable deferred io LCDC on Migo-R
        video: sh_mobile_lcdcfb deferred io support
        video: deferred io with physically contiguous memory
        video: deferred io cleanup
        video: fix deferred io fsync()
        sh: add LCDC interrupt configuration to AP325 and Migo-R
        sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
        sh: split coherent pages
        sh: dma: Kill off ISA DMA wrapper.
        sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
        sh: Kill off the unused SH_ALPHANUMERIC debug option.
        sh: Enable skipping of bss on debug platforms for sh32 also.
        doc: Update sh cpufreq documentation.
        sh: mrshpc_setup_windows() needs to be inline.
        serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
        ...
      81d6e59d
    • Harvey Harrison's avatar
    • Geert Uytterhoeven's avatar
      fbcon: Protect free_irq() by MACH_IS_ATARI check · 7f877ebb
      Geert Uytterhoeven authored
      Add missing check for Atari in free_irq() call, which could cause problems on
      multi-platform m68k kernels.
      Reported-by: default avatarBrad Boyer <flar@allandria.com>
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      7f877ebb
    • Finn Thain's avatar
      fbcon: remove broken mac vbl handler · 79f0c9a0
      Finn Thain authored
      Remove the Mac VBL interrupt code as it doesn't work properly and
      doesn't bring any benefit when fixed. Also remove unused
      DEFAULT_CURSOR_BLINK_RATE macro and irqres variable.
      Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      79f0c9a0