1. 25 May, 2011 5 commits
  2. 24 May, 2011 16 commits
  3. 23 May, 2011 19 commits
    • Joe Perches's avatar
      net: filter: Use WARN_RATELIMIT · 6c4a5cb2
      Joe Perches authored
      A mis-configured filter can spam the logs with lots of stack traces.
      
      Rate-limit the warnings and add printout of the bogus filter information.
      Original-patch-by: default avatarBen Greear <greearb@candelatech.com>
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6c4a5cb2
    • Joe Perches's avatar
      bug.h: Add WARN_RATELIMIT · b3eec79b
      Joe Perches authored
      Add a generic mechanism to ratelimit WARN(foo, fmt, ...) messages
      using a hidden per call site static struct ratelimit_state.
      
      Also add an __WARN_RATELIMIT variant to be able to use a specific
      struct ratelimit_state.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b3eec79b
    • Eric Dumazet's avatar
      sch_sfq: avoid giving spurious NET_XMIT_CN signals · 8efa8854
      Eric Dumazet authored
      While chasing a possible net_sched bug, I found that IP fragments have
      litle chance to pass a congestioned SFQ qdisc :
      
      - Say SFQ qdisc is full because one flow is non responsive.
      - ip_fragment() wants to send two fragments belonging to an idle flow.
      - sfq_enqueue() queues first packet, but see queue limit reached :
      - sfq_enqueue() drops one packet from 'big consumer', and returns
      NET_XMIT_CN.
      - ip_fragment() cancel remaining fragments.
      
      This patch restores fairness, making sure we return NET_XMIT_CN only if
      we dropped a packet from the same flow.
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      CC: Patrick McHardy <kaber@trash.net>
      CC: Jarek Poplawski <jarkao2@gmail.com>
      CC: Jamal Hadi Salim <hadi@cyberus.ca>
      CC: Stephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8efa8854
    • Breno Leitao's avatar
      ehea: Fix multicast registration on semi-promiscuous mode · a4910b74
      Breno Leitao authored
      Ehea will not register multicast groups in phyp if the physical
      interface is in promiscuous mode. But it should register if the
      logical port is in promiscuous mode, but the physical port is not.
      
      Ehea physical promiscuous mode is defined by ehea_port->promisc,
      while logical port is defined by IFF_PROMISC.
      
      So currently, if the user set the interface in promiscuous mode,
      IGMP will not be registred in PHYP, and PHYP will never pass
      the multicast packet to the logical port, which is bad
      
      So, this patch just fixes it, assuring that we register in phyp
      if the physical port is not on promiscuous mode.
      Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a4910b74
    • Eric Dumazet's avatar
      snap: remove one synchronize_net() · 418f275e
      Eric Dumazet authored
      No need to wait for a rcu grace period after list insertion.
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      418f275e
    • Eric Dumazet's avatar
      net: ping: cleanups ping_v4_unhash() · 19a76fa9
      Eric Dumazet authored
      net/ipv4/ping.c: In function ‘ping_v4_unhash’:
      net/ipv4/ping.c:140:28: warning: variable ‘hslot’ set but not used
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      CC: Vasiliy Kulikov <segoon@openwall.com>
      Acked-by: default avatarVasiliy Kulikov <segoon@openwall.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      19a76fa9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 4867faab
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Deal with hyperthetical case of PAGE_SIZE > 2M
        slub: Remove node check in slab_free
        slub: avoid label inside conditional
        slub: Make CONFIG_DEBUG_PAGE_ALLOC work with new fastpath
        slub: Avoid warning for !CONFIG_SLUB_DEBUG
        slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery
        slub: Move debug handlign in __slab_free
        slub: Move node determination out of hotpath
        slub: Eliminate repeated use of c->page through a new page variable
        slub: get_map() function to establish map of free objects in a slab
        slub: Use NUMA_NO_NODE in get_partial
        slub: Fix a typo in config name
      4867faab
    • Pekka Enberg's avatar
      Merge branch 'slab/next' into for-linus · bfb91fb6
      Pekka Enberg authored
      Conflicts:
      	mm/slub.c
      bfb91fb6
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 6fad2b5b
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (coretemp) Fix checkpatch errors
        hwmon: Remove pkgtemp driver
        hwmon: (coretemp) Merge pkgtemp with coretemp
        hwmon: (pmbus) Add support for Analog Devices ADM1275
        hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers
        hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers
        hwmon: (pmbus) Use device specific function to read fan configuration
        hwmon: (pmbus) Expand scope of device specific get_status function
        hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers
        hwmon: Driver for MAX16065 System Manager and compatibles
        hwmon: (sht15) add support for CRC validation
        hwmon: (sht15) add support for the status register
        hwmon: (sht15) clean-up the probe function
        hwmon: (sht15) general code clean-up
        hwmon: Add support for MAX6642
      6fad2b5b
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · 19504828
      Linus Torvalds authored
      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:
        perf tools: Fix sample size bit operations
        perf tools: Fix ommitted mmap data update on remap
        watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
        watchdog: Disable watchdog when thresh is zero
        watchdog: Only disable/enable watchdog if neccessary
        watchdog: Fix rounding bug in get_sample_period()
        perf tools: Propagate event parse error handling
        perf tools: Robustify dynamic sample content fetch
        perf tools: Pre-check sample size before parsing
        perf tools: Move evlist sample helpers to evlist area
        perf tools: Remove junk code in mmap size handling
        perf tools: Check we are able to read the event size on mmap
      19504828
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 57d19e80
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        b43: fix comment typo reqest -> request
        Haavard Skinnemoen has left Atmel
        cris: typo in mach-fs Makefile
        Kconfig: fix copy/paste-ism for dell-wmi-aio driver
        doc: timers-howto: fix a typo ("unsgined")
        perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
        md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
        treewide: fix a few typos in comments
        regulator: change debug statement be consistent with the style of the rest
        Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
        audit: acquire creds selectively to reduce atomic op overhead
        rtlwifi: don't touch with treewide double semicolon removal
        treewide: cleanup continuations and remove logging message whitespace
        ath9k_hw: don't touch with treewide double semicolon removal
        include/linux/leds-regulator.h: fix syntax in example code
        tty: fix typo in descripton of tty_termios_encode_baud_rate
        xtensa: remove obsolete BKL kernel option from defconfig
        m68k: fix comment typo 'occcured'
        arch:Kconfig.locks Remove unused config option.
        treewide: remove extra semicolons
        ...
      57d19e80
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · ee9ec4f8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
        HID: hid-multitouch: cosmetic changes, sort classes and devices
        HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
        HID: hid-multitouch: add support for Unitec panels
        HID: hid-multitouch: add support for Touch International panels
        HID: hid-multitouch: add support for GoodTouch panels
        HID: hid-multitouch: add support for CVTouch panels
        HID: hid-multitouch: add support for ActionStar panels
        HID: hiddev: fix race between hiddev_disconnect and hiddev_release
        HID: magicmouse: ignore 'ivalid report id' while switching modes
        HID: fix a crash in hid_report_raw_event() function.
        HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
        HID: assorted usage updates from hut 1.12
        HID: roccat: fix actual/startup profile sysfs attribute in koneplus
        HID: hid-multitouch: Add support for Lumio panels
        HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
        HID: hid-multitouch: add support for Ilitek dual-touch panel
        HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
        HID: add support for Logitech G27 wheel
        HID: hiddev: fix error path in hiddev_read when interrupted
        HID: add support for Sony Navigation Controller
        ...
      ee9ec4f8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · e0c6b8a1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: apm_mutex breaks ACK; remove it
        APM: take over maintainership
      e0c6b8a1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 710421cc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
        ASoC: core: Don't set "(null)" as a driver name
        ALSA: hda - Use LPIB for ATI/AMD chipsets as default
        Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
        ASoC: Tegra: Fix compile when debugfs not enabled
        ASoC: spdif-dit: Add missing MODULE_*
        SOUND: OSS: Remove Au1550 driver.
        ALSA: hda - add Intel Panther Point HDMI codec id
        ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
        ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
        ALSA: hda - Fix input-src parse in patch_analog.c
        ASoC: davinci-mcasp: enable ping-pong SRAM buffers
        ASoC: add iPAQ hx4700 machine driver
        ASoC: Asahi Kasei AK4641 codec driver
        ALSA: hda - Enable Realtek ALC269 codec input layer beep
        ALSA: intel8x0m: enable AMD8111 modem
        ALSA: HDA: Add jack detection for HDMI
        ALSA: sound, core, pcm_lib: fix xrun_log
        ASoC: Max98095: Move existing NULL check before pointer dereference.
        ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
        ALSA: usb-audio - Add support for USB X-Fi S51 Pro
        ...
      710421cc
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of... · d7ef64a9
      Linus Torvalds authored
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Eliminate various 'set but not used' warnings
        x86, SMEP: Fix section mismatch warnings
        x86, amd: Use _safe() msr access for GartTlbWlk disable code
      d7ef64a9
    • Tejun Heo's avatar
      block: move bd_set_size() above rescan_partitions() in __blkdev_get() · ff2a9941
      Tejun Heo authored
      02e35228 (block: rescan partitions on invalidated devices on
      -ENOMEDIA too) relocated partition rescan above explicit bd_set_size()
      to simplify condition check.  As rescan_partitions() does its own bdev
      size setting, this doesn't break anything; however,
      rescan_partitions() prints out the following messages when adjusting
      bdev size, which can be confusing.
      
        sda: detected capacity change from 0 to 146815737856
        sdb: detected capacity change from 0 to 146815737856
      
      This patch restores the original order and remove the warning
      messages.
      
      stable: Please apply together with 02e35228 (block: rescan
              partitions on invalidated devices on -ENOMEDIA too).
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarTony Luck <tony.luck@gmail.com>
      Tested-by: default avatarTony Luck <tony.luck@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff2a9941
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm · f4b10bc6
      Linus Torvalds authored
      * 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
        KVM: MMU: Use ptep_user for cmpxchg_gpte()
        KVM: Fix kvm mmu_notifier initialization order
        KVM: Add documentation for KVM_CAP_NR_VCPUS
        KVM: make guest mode entry to be rcu quiescent state
        KVM: x86 emulator: Make jmp far emulation into a separate function
        KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
        KVM: x86 emulator: Remove unused arg from emulate_pop()
        KVM: x86 emulator: Remove unused arg from writeback()
        KVM: x86 emulator: Remove unused arg from read_descriptor()
        KVM: x86 emulator: Remove unused arg from seg_override()
        KVM: Validate userspace_addr of memslot when registered
        KVM: MMU: Clean up gpte reading with copy_from_user()
        KVM: PPC: booke: add sregs support
        KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
        KVM: PPC: use ticks, not usecs, for exit timing
        KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
        KVM: PPC: e500: emulate SVR
        KVM: VMX: Cache vmcs segment fields
        KVM: x86 emulator: consolidate segment accessors
        KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
        ...
      f4b10bc6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 53ee7569
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        bnx2x: allow device properly initialize after hotplug
        bnx2x: fix DMAE timeout according to hw specifications
        bnx2x: properly handle CFC DEL in cnic flow
        bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb
        net: filter: move forward declarations to avoid compile warnings
        pktgen: refactor pg_init() code
        pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
        net: skb_trim explicitely check the linearity instead of data_len
        ipv4: Give backtrace in ip_rt_bug().
        net: avoid synchronize_rcu() in dev_deactivate_many
        net: remove synchronize_net() from netdev_set_master()
        rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event
        net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
        bridge: call NETDEV_JOIN notifiers when add a slave
        netpoll: disable netpoll when enslave a device
        macvlan: Forward unicast frames in bridge mode to lowerdev
        net: Remove linux/prefetch.h include from linux/skbuff.h
        ipv4: Include linux/prefetch.h in fib_trie.c
        netlabel: Remove prefetches from list handlers.
        drivers/net: add prefetch header for prefetch users
        ...
      
      Fixed up prefetch parts: removed a few duplicate prefetch.h includes,
      fixed the location of the igb prefetch.h, took my version of the
      skbuff.h code without the extra parentheses etc.
      53ee7569
    • Linus Torvalds's avatar
      Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 4d9dec4d
      Linus Torvalds authored
      * 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
        exec: document acct_arg_size()
        exec: unify do_execve/compat_do_execve code
        exec: introduce struct user_arg_ptr
        exec: introduce get_user_arg_ptr() helper
      4d9dec4d