Skip to content
  1. Apr 26, 2008
    • Akinobu Mita's avatar
      x86: remove unnecessary memset and NULL check after alloc_bootmem() · b1fceac2
      Akinobu Mita authored
      
      
      memset and NULL check after alloc_bootmem() are unnecessary.
      Because it returns zeroed memory and it never return NULL.
      
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b1fceac2
    • Akinobu Mita's avatar
      x86: use bitmap library for pin_programmed · a1a33fa3
      Akinobu Mita authored
      
      
      Use bitmap library for pin_programmed rather than reinvent
      bitmaps.
      
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      a1a33fa3
    • Akinobu Mita's avatar
      x86: use MP_intsrc_info() · 4abc1a00
      Akinobu Mita authored
      
      
      Remove duplicate code by using MP_intsrc_info() in mpparse.c
      
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      4abc1a00
    • Akinobu Mita's avatar
      x86: use BUILD_BUG_ON() for the size of struct intel_mp_floating · 5d47a271
      Akinobu Mita authored
      
      
      Use BUILD_BUG_ON() instead of compile-time error technique with
      extern non-exsistent function.
      
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      5d47a271
    • Roland McGrath's avatar
      x86_64 ia32 ptrace: convert to compat_arch_ptrace · 562b80ba
      Roland McGrath authored
      
      
      Now that there are no more special cases in sys32_ptrace, we
      can convert to using the generic compat_sys_ptrace entry point.
      The sys32_ptrace function gets simpler and becomes compat_arch_ptrace.
      
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      562b80ba
    • Roland McGrath's avatar
      x86_64 ia32 ptrace: use compat_ptrace_request for siginfo · cdb69904
      Roland McGrath authored
      
      
      This removes the special-case handling for PTRACE_GETSIGINFO
      and PTRACE_SETSIGINFO from x86_64's sys32_ptrace.  The generic
      compat_ptrace_request code handles these.
      
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      cdb69904
    • Roland McGrath's avatar
      x86 signals: lift set_fs · 55928e37
      Roland McGrath authored
      
      
      This lifts the set_fs(USER_DS) call for signal handler setup out of the
      three places copying the same code into the one place that calls them
      all.  There is no change in what it does.
      
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      55928e37
    • Roland McGrath's avatar
      x86 signals: lift flags diddling code · 8b9c5ff3
      Roland McGrath authored
      
      
      This lifts the code diddling the TF and DF bits for signal handler setup
      out of the several places copying the same code into the one place that
      calls them all.  There is no change in what it does.
      
      I also separated the recently-added DF bit clearing from the TF diddling.
      The compiler turns them back into one instruction anyway.  The tossing
      in of DF to the same line of code with no new comments was a bit more
      arcane than seems wise.
      
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      8b9c5ff3
    • Dmitri Vorobiev's avatar
      x86: remove NexGen support · f7f17a67
      Dmitri Vorobiev authored
      
      
      It is claimed that NexGen CPUs were never shipped:
      
         http://lkml.org/lkml/2008/4/20/179
      
      Also, the kernel support for these chips has been broken for
      a long time, the code intended to support NexGen thereby being
      essentially dead.
      
      As an outcome of the discussion that can be found using the URL
      above, this patch removes the NexGen support altogether.
      
      The changes in this patch survived a defconfig build for i386, a
      couple of successful randconfig builds, as well as a runtime test,
      which consisted in booting a 32-bit x86 box up to the shell prompt.
      
      Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      f7f17a67
    • Dmitri Vorobiev's avatar
      x86: array can become static · a2b4bd9c
      Dmitri Vorobiev authored
      
      
      In arch/x86/kernel/setup_64.c, the standard_io_resources array
      is needlessly defined as global. This patch makes this variable
      static.
      
      This patch was successfully build-tested using the defconfig
      for x86_64. Runtime test was performed by booting a 64-bit x86
      box up to the shell prompt.
      
      Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      a2b4bd9c
    • Dmitri Vorobiev's avatar
      x86: remove unused function amd_init_cpu() · f3b14a32
      Dmitri Vorobiev authored
      
      
      There are no users for the function amd_init_cpu() defined in
      arch/x86/kernel/cpu/amd.c. This patch removes this routine.
      
      This patch was build-tested using defconfigs for i386 and x86_64,
      and a few randconfig instances. Runtime tests were performed by
      booting 32- and 64-bit x86 boxen up to the shell prompt.
      
      Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      f3b14a32
    • Jan Beulich's avatar
      x86-64: extend MCE CPU quirk handling · 911f6a7b
      Jan Beulich authored
      
      
      At least on my Barcelona, I see MCE log entries after cold boot caused
      by BIOS not properly clearing the respective registers. Therefore, this
      patch extends the workaround to families 0x10 and 0x11 (the latter just
      for completeness, I have nothing to verify this against).
      At the same time, provide a way to make these entries visible via the
      'mce=bootlog' command line option even on these machines.
      
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      911f6a7b
    • Jan Beulich's avatar
      i386: fix signal type for iret exception · 79bf0e03
      Jan Beulich authored
      
      
      .. since it uses ILL_BADSTK (which is meaningless in the context of
      SIGSEGV).
      
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      79bf0e03
    • Jan Beulich's avatar
      x86: fix watchdog ops for CoreDuo · 86d78f64
      Jan Beulich authored
      There apparently was an unnoticed conflict between an earlier patch to
      this file and mine (d1e08474
      
      ), which
      I noticed only now. I suppose a change like the one below (untested) is
      needed; I didn't get any response on a confirmation request for this from
      the submitter of the first patch.
      
      The issue is the writing of the 'checkbit' member at the end of
      setup_intel_arch_watchdog(), which my patch made go to intel_arch_wd_ops
      rather than wd_ops.
      
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      86d78f64
    • Adrian Bunk's avatar
      fix asm-x86/{posix_types,unistd}.h · b11caa7c
      Adrian Bunk authored
      Jeff Chua reported that:
      
      Commit e40c0fe6
      
      
      (x86: cleanup duplicate includes) turned the userspace
      asm-x86/posix_types.h and asm-x86/unistd.h headers into
      empty files.
      
      This patch reverts these bogus changes.
      
      Reported-by: default avatarJeff Chua <jeff.chua.linux@gmail.com>
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b11caa7c
    • Jan Beulich's avatar
      i386: fix asm constraint in do_IRQ() · 5065dbaf
      Jan Beulich authored
      
      
      Two prior changes resulted in the "ecx" clobber being lost.
      
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      5065dbaf
    • Harvey Harrison's avatar
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · bc84e0a1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        [PATCH] sanitize locate_fd()
        [PATCH] sanitize unshare_files/reset_files_struct
        [PATCH] sanitize handling of shared descriptor tables in failing execve()
        [PATCH] close race in unshare_files()
        [PATCH] restore sane ->umount_begin() API
        cifs: timeout dfs automounts +little fix.
      bc84e0a1
    • Harvey Harrison's avatar
    • Randy Dunlap's avatar
      documentation: remove smart-config.txt · 753d7054
      Randy Dunlap authored
      
      
      As requested by Sam Ravnborg: Remove Documentation/smart-config.txt.
      
      It is outdated and has been (functionally) replaced by
      Documentation/kbuild/*.txt.
      
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      753d7054
    • Roland Dreier's avatar
      Export __locks_copy_lock() so modular lockd builds · 3dd7b71c
      Roland Dreier authored
      Commit 1a747ee0
      
       ("locks: don't call ->copy_lock methods on return of
      conflicting locks") changed fs/lockd/svclock.c to call
      __locks_copy_lock() instead of locks_copy_lock(), but lockd can be built
      as a module and __locks_copy_lock() is not exported, which causes a
      build error
      
          ERROR: "__locks_copy_lock" [fs/lockd/lockd.ko] undefined!
      
      with CONFIG_LOCKD=m.
      
      Fix this by exporting __locks_copy_lock().
      
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3dd7b71c
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · b9fa38f7
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
        [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
        [POWERPC] bootwrapper: fix build error on virtex405-head.S
        [POWERPC] 4xx: Fix 460GT support to not enable FPU
        [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
        [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
        [POWERPC] Xilinx: boot support for Xilinx uart 16550.
        [POWERPC] celleb: Add support for PCI Express
        [POWERPC] celleb: Move miscellaneous files for Beat
        [POWERPC] celleb: Move a file for SPU on Beat
        [POWERPC] celleb: Move files for Beat mmu and iommu
        [POWERPC] celleb: Move files for Beat hvcall interfaces
        [POWERPC] celleb: Move the SCC related code for celleb
        [POWERPC] celleb: Move the files for celleb base support
        [POWERPC] celleb: Consolidate io-workarounds code
        [POWERPC] cell: Generalize io-workarounds code
        [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
        [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
        [POWERPC] Register udbg console early on pseries LPAR
        [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
        [POWERPC] Set udbg_console index to 0
        ...
      b9fa38f7
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6e18933f
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
        [IA64] fix bootmem regression on Altix
      6e18933f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds · eb855fd8
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
        leds: Add default-on trigger
        leds: Document the context brightness_set needs
        leds: Add new driver for the LEDs on the Freecom FSG-3
        leds: Add support to leds with readable status
        leds: enable support for blink_set() platform hook in leds-gpio
        leds: Cleanup various whitespace and code style issues
        leds: disable triggers on brightness set
        leds: Add mail LED support for "Clevo D400P"
      eb855fd8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat · bf16ae25
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat:
        generic: add ioremap_wc() interface wrapper
        /dev/mem: make promisc the default
        pat: cleanups
        x86: PAT use reserve free memtype in mmap of /dev/mem
        x86: PAT phys_mem_access_prot_allowed for dev/mem mmap
        x86: PAT avoid aliasing in /dev/mem read/write
        devmem: add range_is_allowed() check to mmap of /dev/mem
        x86: introduce /dev/mem restrictions with a config option
      bf16ae25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · 0b79dada
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
        sched: fix share (re)distribution
        softlockup: fix NOHZ wakeup
        seqlock: livelock fix
      0b79dada
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 50be4917
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_bf54x: decrease count first.
        sata_mv: re-enable hotplug, update TODO list
        sata_mv: leave SError bits untouched in mv_err_intr
        sata_mv: more interrupt handling rework
        sata_mv: tidy host controller interrupt handling
        sata_mv: simplify request/response queue handling
        sata_mv: simplify freeze/thaw bit-shift calculations
        sata_mv mask all interrupt coalescing bits
        sata_mv more cosmetics
        ata_piix: add Asus Eee 701 controller to short cable list
        libata-eh set tf flags in NCQ EH result_tf
        make sata_set_spd_needed() static
        make sata_print_link_status() static
        libata-acpi.c: remove unneeded #if's
        sata_nv: make hardreset return -EAGAIN on success
        ahci: retry enabling AHCI a few times before spitting out WARN_ON()
        libata: make WARN_ON conditions in ata_sff_hsm_move() more strict
        ATA/IDE: fix platform driver hotplug/coldplug
        sata_sis: SCR accessors return -EINVAL when requested SCR isn't available
        libata: functions with definition should not be extern
      50be4917
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 37b05b17
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (120 commits)
        usb: don't update devnum for wusb devices
        wusb: make ep0_reinit available for modules
        wusb: devices dont use a set address
        wusb: teach choose_address() about wireless devices
        wusb: add link wusb-usb device
        wusb: add authenticathed bit to usb_dev
        USB: remove unnecessary type casting of urb->context
        usb serial: more fixes and groundwork for tty changes
        USB: replace remaining __FUNCTION__ occurrences
        USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
        USB: fix compile problems in ehci-hcd
        USB: ehci: qh_completions cleanup and bugfix
        USB: cdc-acm: signedness fix
        USB: add documentation about callbacks
        USB: don't explicitly reenable root-hub status interrupts
        USB: OHCI: turn off RD when remote wakeup is disabled
        USB: HCDs use the do_remote_wakeup flag
        USB: g_file_storage: ignore bulk-out data after invalid CBW
        USB: serial: remove endpoints setting checks from core and header
        USB: serial: remove unneeded number endpoints settings
        ...
      37b05b17
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · ce1d5b23
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: wacom - add support for Cintiq 20WSX
        Input: ucb1400_ts - IRQ probe fix
        Input: at32psif - update MODULE_AUTHOR with new email
        Input: mac_hid - add lockdep annotation to emumousebtn
        Input: i8042 - fix incorrect usage of strncpy and strncat
        Input: bf54x-keys - add infrastructure for keypad wakeups
        Input: add MODULE_ALIAS() to hotpluggable platform modules
        Input: drivers/char/keyboard.c - use time_after
        Input: fix ordering in joystick Makefile
        Input: wm97xx-core - support use as a wakeup source
        Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
        Input: wm97xx-core - only schedule interrupt handler if not already scheduled
        Input: add Zhen Hua driver
        Input: aiptek - add support for Genius G-PEN 560 tablet
        Input: wacom - implement suspend and autosuspend
        Input: xpad - set proper buffer length for outgoing requests
        Input: omap-keypad - fix build warning
        Input: gpio_keys - irq handling cleanup
        Input: add PS/2 serio driver for AVR32 devices
        Input: put ledstate in the keyboard notifier
        ...
      ce1d5b23
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · ad5e1b0f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
        kconfig: fix broken target update-po-config
        kbuild: silence documentation GEN xml messages according to $(quiet)
      ad5e1b0f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 6f97b220
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (24 commits)
        dm crypt: add documentation
        dm: remove md argument from specific_minor
        dm table: remove unused dm_create_error_table
        dm table: drop void suspend_targets return
        dm: unplug queues in threads
        dm raid1: use timer
        dm: move include files
        dm kcopyd: rename
        dm: expose macros
        dm kcopyd: remove redundant client counting
        dm kcopyd: private mempool
        dm kcopyd: per device
        dm log: make module use tracking internal
        dm log: move register functions
        dm log: clean interface
        dm kcopyd: clean interface
        dm io: clean interface
        dm io: rename error to error_bits
        dm snapshot: store pointer to target instance
        dm log: move dirty region log code into separate module
        ...
      6f97b220
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next · 4b7227ca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next: (52 commits)
        xen: add balloon driver
        xen: allow compilation with non-flat memory
        xen: fold xen_sysexit into xen_iret
        xen: allow set_pte_at on init_mm to be lockless
        xen: disable preemption during tlb flush
        xen pvfb: Para-virtual framebuffer, keyboard and pointer driver
        xen: Add compatibility aliases for frontend drivers
        xen: Module autoprobing support for frontend drivers
        xen blkfront: Delay wait for block devices until after the disk is added
        xen/blkfront: use bdget_disk
        xen: Make xen-blkfront write its protocol ABI to xenstore
        xen: import arch generic part of xencomm
        xen: make grant table arch portable
        xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one
        xen: make include/xen/page.h portable moving those definitions under asm dir
        xen: add resend_irq_on_evtchn() definition into events.c
        Xen: make events.c portable for ia64/xen support
        xen: move events.c to drivers/xen for IA64/Xen support
        xen: move features.c from arch/x86/xen/features.c to drivers/xen
        xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs
        ...
      4b7227ca
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 5dae61b8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
        [SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
      5dae61b8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 2e561c7b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
        net: Fix wrong interpretation of some copy_to_user() results.
        xfrm: alg_key_len & alg_icv_len should be unsigned
        [netdrvr] tehuti: move ioctl perm check closer to function start
        ipv6: Fix typo in net/ipv6/Kconfig
        via-velocity: fix vlan receipt
        tg3: sparse cleanup
        forcedeth: realtek phy crossover detection
        ibm_newemac: Increase MDIO timeouts
        gianfar: Fix skb allocation strategy
        netxen: reduce stack usage of netxen_nic_flash_print
        smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt}
        net drivers: fix platform driver hotplug/coldplug
        forcedeth: new backoff implementation
        ehea: make things static
        phylib: Add support for board-level PHY fixups
        [netdrvr] atlx: code movement: move atl1 parameter parsing
        atlx: remove flash vendor parameter
        korina: misc cleanup
        korina: fix misplaced return statement
        WAN: Fix confusing insmod error code for C101 too.
        ...
      2e561c7b
    • Matthew Wilcox's avatar
      Update .gitignore files · 2cfed60c
      Matthew Wilcox authored
      
      
      Add some autogenerated files to various .gitignore files
      
      Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2cfed60c
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 7e97b283
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (82 commits)
        [MTD] m25p80: Add Support for ATMEL AT25DF641 64-Megabit SPI Flash
        [MTD] m25p80: add FAST_READ access support to M25Pxx
        [MTD] [NAND] bf5xx_nand: Avoid crash if bfin_mac is installed.
        [MTD] [NAND] at91_nand: control NCE signal
        [MTD] [NAND] AT91 hardware ECC compile fix for at91sam9263 / at91sam9260
        [MTD] [NAND] Hardware ECC controller on at91sam9263 / at91sam9260
        [JFFS2] Introduce dbg_readinode2 log level, use it to shut read_dnode() up
        [JFFS2] Fix jffs2_reserve_space() when all blocks are pending erasure.
        [JFFS2] Add erase_checking_list to hold blocks being marked.
        UBI: add a message
        [JFFS2] Return values of jffs2_block_check_erase error paths
        [MTD] Clean up AR7 partition map support
        [MTD] [NOR] Fix Intel CFI driver for collie flash
        [JFFS2] Finally remove redundant ref->__totlen field.
        [JFFS2] Honour TEST_TOTLEN macro in debugging code. ref->__totlen is going!
        [JFFS2] Add paranoia debugging for superblock counts
        [JFFS2] Fix free space leak with in-band cleanmarkers
        [JFFS2] Self-sufficient #includes in jffs2_fs_i.h: include <linux/mutex.h>
        [MTD] [NAND] Verify probe by retrying to checking the results match
        [MTD] [NAND] S3C2410 Allow ECC disable to be specified by the board
        ...
      7e97b283
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · 5421d059
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2:
        sched: use alloc_bootmem() instead of alloc_bootmem_low()
      5421d059
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 5f3b2878
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: silence defined but not used warning in non-modular builds
        ieee1394: rawiso: requeue packet for transmission after skipped cycle
      5f3b2878
    • Sam Ravnborg's avatar
      kconfig: fix broken target update-po-config · 4217516e
      Sam Ravnborg authored
      
      
      Massimo Maiurana reported:
      In the latest kernel "make update-po-config" fails because it tries
      to open arch/Kconfig/Kconfig, since the ls command doesn't
      distinguish between files and directories.
      
      Cc: Massimo Maiurana <maiurana@gmail.com>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      4217516e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · f7ce1f5e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
        kbuild: fix depmod comment
        kbuild: Add new Kbuild variable KBUILD_EXTRA_SYMBOLS
        kbuild: support loading extra symbols in modpost
        Add option to enable -Wframe-larger-than= on gcc 4.4
        kbuild: add kconfig symbols to tags output
        kbuild: fix some minor typoes
        kbuild: error out on missing MODULE_LICENSE
      f7ce1f5e