Linus Torvalds
f3747e2f2c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking update from David Miller:
1) Pairing and deadlock fixes in bluetooth from Johan Hedberg.
2) Add device IDs for AR3011 and AR3012 bluetooth chips. From
Giancarlo Formicuccia and Marek Vasut.
3) Fix wireless regulatory deadlock, from Eliad Peller.
4) Fix full TX ring panic in bnx2x driver, from Eric Dumazet.
5) Revert the two commits that added skb_orphan_try(), it causes
erratic bonding behavior with UDP clients and the gains it used to
give are mostly no longer happening due to how BQL works. From Eric
Dumazet.
6) It took two tries, but Thomas Graf fixed a problem wherein we
registered ipv6 routing procfs files before their backend data were
initialized properly.
7) Fix max GSO size setting in be2net, from Sarveshwar Bandi.
8) PHY device id mask is wrong for KSZ9021 and KS8001 chips, fix from
Jason Wang.
9) Fix use of stale SKB data pointer after skb_linearize() call in
batman-adv, from Antonio Quartulli.
10) Fix memory leak in IXGBE due to missing __GFP_COMP, from Alexander
Duyck.
11) Fix probing of Gobi devices in qmi_wwan usbnet driver, from Bjørn
Mork.
12) Fix suspend/resume and open failure handling in usbnet from Ming
Lei.
13) Attempt to fix device r8169 hangs for certain chips, from Francois
Romieu.
14) Fix advancement of RX dirty pointer in some situations in sh_eth
driver, from Yoshihiro Shimoda.
15) Attempt to fix restart of IPV6 routing table dumps when there is an
intervening table update. From Eric Dumazet.
16) Respect security_inet_conn_request() return value in ipv6 TCP. From
Neal Cardwell.
17) Add another iPAD device ID to ipheth driver, from Davide Gerhard.
18) Fix access to freed SKB in l2tp_eth_dev_xmit(), and fix l2tp lockdep
splats, from Eric Dumazet.
19) Make sure all bridge devices, regardless of whether they were
created via netlink or ioctls, have their rtnetlink ops hooked up.
From Thomas Graf and Stephen Hemminger.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)
9p: fix min_t() casting in p9pdu_vwritef()
can: flexcan: use be32_to_cpup to handle the value of dt entry
xen/netfront: teardown the device before unregistering it.
bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)
vhost: use USER_DS in vhost_worker thread
ixgbe: Do not pad FCoE frames as this can cause issues with FCoE DDP
net: l2tp_eth: use LLTX to avoid LOCKDEP splats
mac802154: add missed braces
net: l2tp_eth: fix l2tp_eth_dev_xmit race
net/mlx4_en: Release QP range in free_resources
net/mlx4: Use single completion vector after NOP failure
net/mlx4_en: Set correct port parameters during device initialization
ipheth: add support for iPad
caif-hsi: Add missing return in error path
caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost
caif: Clear shutdown mask to zero at reconnect.
tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request()
ipv6: fib: fix fib dump restart
batman-adv: fix race condition in TT full-table replacement
batman-adv: only drop packets of known wifi clients
...
2012-06-28 11:20:31 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-05-30 11:17:19 -07:00
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
2012-05-20 10:06:08 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-05-24 10:34:29 -07:00
iio: Add dev_to_iio_dev() helper function
2012-05-14 13:34:31 -07:00
MFD changes for 3.5
2012-05-29 11:53:11 -07:00
net/mlx4_core: Fix number of EQs used in ICM initialisation
2012-05-31 18:18:16 -04:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-06-20 14:41:57 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
netfilter: xt_HMARK: fix endianness and provide consistent hashing
2012-06-07 14:53:01 +02:00
NFC: HCI based pn544 driver
2012-05-15 17:30:30 -04:00
Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux
2012-05-31 18:18:11 -07:00
hwmon updates for 3.5-rc1
2012-05-23 14:15:09 -07:00
lib/raid6: Add SSSE3 optimized recovery functions
2012-05-22 13:54:18 +10:00
rtc: ds1307: add trickle charger support
2012-05-29 16:22:33 -07:00
ARM: MMP: add pxa910-ssp into ssp_id_table
2012-06-11 12:25:50 +08:00
bcma/ssb: parse new attributes from sprom
2012-05-16 12:45:22 -04:00
nfsd4: move rq_flavor into svc_cred
2012-05-31 20:29:58 -04:00
USB: add NO_D3_DURING_SLEEP flag and revert 151b612847
2012-06-13 13:11:39 -07:00
drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
2012-05-29 16:22:29 -07:00
atm: remove the coupling to token ring support
2012-05-15 20:14:35 -04:00
gpio/generic: initialize basic_mmio_gpio shadow variables properly
2012-05-19 12:17:35 -06:00
Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block
2012-05-30 08:52:42 -07:00
mm: remove sparsemem allocation details from the bootmem allocator
2012-05-29 16:22:22 -07:00
bug: introduce BUILD_BUG_ON_INVALID() macro
2012-05-29 16:22:20 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
clk: Provide dummy clk_unregister()
2012-05-15 12:02:39 -07:00
clockevents: Make clockevents_config() a global symbol
2012-05-25 01:44:51 +02:00
Revert "mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks"
2012-06-03 20:05:57 -07:00
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
2012-05-31 17:49:32 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
cpu: introduce clear_tasks_mm_cpumask() helper
2012-05-31 17:49:29 -07:00
cred: remove task_is_dead() from __task_cred() validation
2012-05-31 17:49:28 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
dma-buf: minor documentation fixes.
2012-05-25 12:46:23 +05:30
drivers: add Contiguous Memory Allocator
2012-05-21 15:09:37 +02:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
edac: Initialize the dimm label with the known information
2012-05-28 19:13:50 -03:00
vfs: retry last component if opening stale dentry
2012-06-01 12:12:01 -04:00
etherdevice: fix comments
2012-05-17 15:36:35 -04:00
linux/ethtool: Added macro ETH_FW_DUMP_DISABLE
2012-05-15 13:13:33 -04:00
eventfd: change int to __u64 in eventfd_signal()
2012-05-31 17:49:32 -07:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
frontswap: s/put_page/store/g s/get_page/load
2012-05-15 11:34:08 -04:00
vfs: move inode stat information closer together
2012-06-03 14:50:19 -07:00
fsnotify: handle subfiles' perm events
2012-05-30 21:04:53 -04:00
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
2012-05-16 20:00:27 -04:00
genetlink: Build a generic netlink family module alias
2012-05-29 22:33:56 -04:00
block: fix buffer overflow when printing partition UUIDs
2012-05-15 08:22:04 +02:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
gpiolib: Implement devm_gpio_request_one()
2012-05-18 16:48:35 -06:00
Merge branch 'upstream' into for-linus
2012-05-22 11:32:31 +02:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
mm: add new arch_make_huge_pte() method for tile support
2012-05-25 12:48:26 -04:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
i2c: Add generic I2C multiplexer using pinctrl API
2012-06-04 16:49:43 +02:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
if: restore token ring ARP type to header
2012-05-22 17:13:11 -04:00
ipv6: correct the ipv6 option name - Pad0 to Pad1
2012-05-17 15:49:51 -04:00
sched: Move nr_cpus_allowed out of 'struct sched_rt_entity'
2012-05-30 14:02:25 +02:00
genirq: reimplement exit_irq_thread() hook via task_work_add()
2012-05-23 22:11:12 -04:00
iommu/core: pass a user-provided token to fault handlers
2012-05-22 18:08:08 +02:00
mqueue: separate mqueue default value from maximum value
2012-05-31 17:49:31 -07:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
irq: Remove irq_chip->release()
2012-05-21 21:09:38 +02:00
irqdomain: Kill off duplicate definitions.
2012-05-19 12:41:56 -06:00
jbd: Write journal superblock with WRITE_FUA after checkpointing
2012-05-15 23:34:37 +02:00
ext4/jbd2: add metadata checksumming to the list of supported features
2012-05-27 08:12:42 -04:00
vsprintf: fix %ps on non symbols when using kallsyms
2012-05-29 16:22:32 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
kbuild: install kernel-page-flags.h
2012-05-29 16:22:21 -07:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
keys: kill the dummy key_replace_session_keyring()
2012-05-23 22:11:31 -04:00
kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
2012-05-31 17:49:28 -07:00
kmsg - kmsg_dump() fix CONFIG_PRINTK=n compilation
2012-06-18 15:55:21 -07:00
KVM: s390: add capability indicating COW support
2012-05-17 21:06:01 -03:00
KVM: MMU: Don't use RCU for lockless shadow walking
2012-05-16 16:08:28 -03:00
lcd: add callbacks for early fb event blank support
2012-05-29 16:22:29 -07:00
include/linux/led-lm3530.h: comment correction about the range of brightness
2012-05-29 16:22:32 -07:00
leds: add new field to led_classdev struct to save activation state
2012-05-29 16:22:31 -07:00
brlocks/lglocks: turn into functions
2012-05-29 23:28:41 -04:00
lockdep: fix oops in processing workqueue
2012-05-15 08:08:31 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: do_migrate_pages(): rename arguments
2012-05-29 16:22:20 -07:00
phy/micrel: Fix ID of KSZ9021
2012-05-22 15:20:28 -04:00
mISDN: Implement MISDN_CTRL_RX_OFF for more drivers
2012-05-16 15:24:36 -04:00
mISDN: Allow to set a minimum length for transparent data
2012-05-16 15:23:46 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-06-01 10:34:35 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: fix slab->page _count corruption when using slub
2012-06-20 14:39:35 -07:00
bug: completely remove code generated by disabled VM_BUG_ON()
2012-05-29 16:22:20 -07:00
mm: add link from struct lruvec to struct zone
2012-05-29 16:22:26 -07:00
module_param: stop double-calling parameters.
2012-06-08 14:58:13 +09:30
fat: introduce special inode for managing the FSINFO block
2012-05-31 17:49:27 -07:00
net: add MODULE_ALIAS_NET_PF_PROTO_NAME
2012-05-29 22:33:55 -04:00
netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
2012-05-30 16:34:27 -04:00
NFSv4.1: Add DESTROY_CLIENTID
2012-05-26 14:17:30 -04:00
NFSv4.1 add nfs_inode book keeping for mdsthreshold
2012-05-24 16:15:48 -04:00
NFSv4.1: Fix umount when filelayout DS is also the MDS
2012-06-18 08:45:16 -04:00
NFS: Fix a commit bug
2012-06-05 18:38:47 -04:00
nl80211: prevent additions to old station flags API
2012-05-16 13:08:15 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
gpio: Adjust of_xlate API to support multiple GPIO chips
2012-05-18 16:48:36 -06:00
OF: PCI: const usage needed by MIPS
2012-05-21 14:31:48 +01:00
mm, oom: normalize oom scores to oom_score_adj scale only for userspace
2012-05-29 16:22:24 -07:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
pagemap.h: fix warning about possibly used before init var
2012-05-29 16:22:18 -07:00
Viresh has moved
2012-06-20 14:39:36 -07:00
USB: add NO_D3_DURING_SLEEP flag and revert 151b612847
2012-06-13 13:11:39 -07:00
percpu: remove percpu_xxx() functions
2012-05-14 14:15:32 -07:00
perf: Limit callchains to 127
2012-06-06 17:08:00 +02:00
netdev/phy: Make get_phy_id() static and quit EXPORTing it.
2012-05-16 00:59:12 -04:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
PM / Domains: Make it possible to add devices to inactive domains
2012-05-18 20:45:26 +02:00
c/r: prctl: add ability to get clear_tid_address
2012-06-07 14:43:55 -07:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pstore/ram_core: Factor persistent_ram_zap() out of post_init()
2012-06-13 16:52:40 -07:00
ASoC: fix pxa-ssp compiling issue under mach-mmp
2012-06-11 12:26:15 +08:00
radix-tree: fix contiguous iterator
2012-06-05 10:46:40 -07:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
rcu: Precompute RCU_FAST_NO_HZ timer offsets
2012-06-06 20:43:28 -07:00
rcu: Precompute RCU_FAST_NO_HZ timer offsets
2012-06-06 20:43:28 -07:00
rescounter: remove __must_check from res_counter_charge_nofail()
2012-05-29 16:22:27 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
rtc: add ioctl to get/clear battery low voltage status
2012-05-29 16:22:33 -07:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-06-08 14:59:29 -07:00
take security_mmap_file() outside of ->mmap_sem
2012-06-01 10:37:01 -04:00
serial: delete the MCA specific 8250 support.
2012-05-17 19:02:14 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
userns: Convert tmpfs to use kuid and kgid where appropriate
2012-05-15 14:59:29 -07:00
new helper: signal_delivered()
2012-06-01 12:58:52 -04:00
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
userns: Convert stat to return values mapped from kuids and kgids
2012-05-15 14:08:35 -07:00
stmmac: add mixed burst for DMA
2012-05-14 18:53:19 -04:00
Frontswap provides a "transcendent memory" interface for swap pages.
2012-06-04 12:28:45 -07:00
mm: frontswap: core swap subsystem hooks and headers
2012-05-15 11:33:58 -04:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
sysfs: get rid of some lockdep false positives
2012-05-14 12:19:56 -07:00
task_work_add: generic process-context callbacks
2012-05-23 22:09:21 -04:00
net: Make linux/tcp.h C++ friendly (trivial)
2012-06-09 21:27:18 -07:00
set_restore_sigmask() is never called without SIGPENDING (and never should be)
2012-06-01 12:58:50 -04:00
time: remove obsolete declaration
2012-05-21 16:16:58 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
keys: kill the dummy key_replace_session_keyring()
2012-05-23 22:11:31 -04:00
tty: Revert the tty locking series, it needs more work
2012-06-02 15:21:43 -07:00
bury __kernel_nlink_t, make internal nlink_t consistent
2012-05-30 21:04:50 -04:00
USB: Fix core compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:03 -07:00
[media] v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings
2012-05-20 08:27:44 -03:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[media] Fix regression in ioctl numbering
2012-06-11 15:47:21 -03:00
virtio: fix typo in comment
2012-05-22 12:16:16 +09:30
watchdog: Add support for dynamically allocated watchdog_device structs
2012-05-30 07:55:31 +02:00
