1. 04 May, 2008 2 commits
  2. 03 May, 2008 11 commits
    • Linus Torvalds's avatar
      Linux 2.6.26-rc1 · 2ddcca36
      Linus Torvalds authored
      2ddcca36
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/battery-2.6 · 38e80121
      Linus Torvalds authored
      * git://git.infradead.org/battery-2.6:
        PMU battery: filenames in sysfs with spaces
        pda_power: add init and exit function callbacks
      38e80121
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes · e0986756
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits)
        Make constants in kernel/timeconst.h fixed 64 bits
        types: add C99-style constructors to <asm-generic/int-*.h>
        xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
        x86: types: use <asm-generic/int-*.h> for the x86 architecture
        v850: types: use <asm-generic/int-*.h> for the v850 architecture
        sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
        sparc: types: use <asm-generic/int-*.h> for the sparc architecture
        sh: types: use <asm-generic/int-*.h> for the sh architecture
        s390: types: use <asm-generic/int-*.h> for the s390 architecture
        powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
        parisc: types: use <asm-generic/int-*.h> for the parisc architecture
        mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
        mips: types: use <asm-generic/int-*.h> for the mips architecture
        m68k: types: use <asm-generic/int-*.h> for the m68k architecture
        m32r: types: use <asm-generic/int-*.h> for the m32r architecture
        ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
        h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
        frv: types: use <asm-generic/int-*.h> for the frv architecture
        cris: types: use <asm-generic/int-*.h> for the cris architecture
        blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
        ...
      e0986756
    • Jesse Barnes's avatar
      [MAINTAINERS] PCI list moved · 2905474d
      Jesse Barnes authored
      Many thanks to Martin for his years of hosting.  The pci list has moved to
      vger, along with what seems like the rest of the major Linux mailing lists.
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2905474d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · c402f98c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: #ifdef simplification
        slabinfo: Support printout of the number of fallbacks
        slub: Whitespace cleanup and use of strict_strtoul
      c402f98c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4f9faaac
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
        rose: Wrong list_lock argument in rose_node seqops
        netns: Fix reassembly timer to use the right namespace
        netns: Fix device renaming for sysfs
        bnx2: Update version to 1.7.5.
        bnx2: Update RV2P firmware for 5709.
        bnx2: Zero out context memory for 5709.
        bnx2: Fix register test on 5709.
        bnx2: Fix remote PHY initial link state.
        bnx2: Refine remote PHY locking.
        bridge: forwarding table information for >256 devices
        tg3: Update version to 3.92
        tg3: Add link state reporting to UMP firmware
        tg3: Fix ethtool loopback test for 5761 BX devices
        tg3: Fix 5761 NVRAM sizes
        tg3: Use constant 500KHz MI clock on adapters with a CPMU
        hci_usb.h: fix hard-to-trigger race
        dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
        net: remove NR_CPUS arrays in net/core/dev.c
        net: use get/put_unaligned_* helpers
        bluetooth: use get/put_unaligned_* helpers
        ...
      4f9faaac
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · bf640be4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc32: Delete prom_stdin and prom_stdout.
        sparc32: More memory probing consolidation.
        sparc32: Kill totally unused memory information tables.
        sparc64: Fix syscall restart, for real...
        serial: Fix sparc driver name strings.
        sparc64: Stop creating dummy root PCI host controller devices.
      bf640be4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · c36c8045
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
        [POWERPC] PS3: Update ps3_defconfig
        [POWERPC] PS3: Remove unsupported wakeup sources
        [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
        [POWERPC] PS3: Add time include to lpm
        [POWERPC] Fix slb.c compile warnings
        [POWERPC] Xilinx: Fix compile warnings
        [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
        [RAPIDIO] fix current kernel-doc notation
        [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
        Fix a potential issue in mpc52xx uart driver
        [POWERPC] mpc5200: Allow for fixed speed MII configurations
        [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board
      c36c8045
    • Bernard Pidoux's avatar
      rose: Wrong list_lock argument in rose_node seqops · f37f2c62
      Bernard Pidoux authored
      In rose_node_start() as well as in rose_node_stop() __acquires() and
      spin_lock_bh() were wrongly passing rose_neigh_list_lock instead of
      rose_node_list_lock arguments.
      Signed-off-by: default avatarBernard Pidoux <f6bvp@amsat.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f37f2c62
    • Daniel Lezcano's avatar
      netns: Fix reassembly timer to use the right namespace · 4ac2ccd0
      Daniel Lezcano authored
      This trivial fix retrieves the network namespace from frag queue
      and use it to get the network device in the right namespace.
      Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4ac2ccd0
    • Daniel Lezcano's avatar
      netns: Fix device renaming for sysfs · aaf8cdc3
      Daniel Lezcano authored
      When a netdev is moved across namespaces with the
      'dev_change_net_namespace' function, the 'device_rename' function is
      used to fixup kobject and refresh the sysfs tree. The device_rename
      function will call kobject_rename and this one will check if there is
      an object with the same name and this is the case because we are
      renaming the object with the same name.
      
      The use of 'device_rename' seems for me wrong because we usually don't
      rename it but just move it across namespaces. As we just want to do a
      mini "netdev_[un]register", IMO the functions
      'netdev_[un]register_kobject' should be used instead, like an usual
      network device [un]registering.
      
      This patch replace device_rename by netdev_unregister_kobject,
      followed by netdev_register_kobject.
      
      The netdev_register_kobject will call device_initialize and will raise
      a warning indicating the device was already initialized. In order to
      fix that, I split the device initialization into a separate function
      and use it together with 'netdev_register_kobject' into
      register_netdevice. So we can safely call 'netdev_register_kobject' in
      'dev_change_net_namespace'.
      
      This fix will allow to properly use the sysfs per namespace which is
      coming from -mm tree.
      Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
      Acked-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aaf8cdc3
  3. 02 May, 2008 27 commits