Linus Torvalds
f4ba394c1b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Missed rcu_assign_pointer() in mac80211 scanning, from Johannes
Berg.
2) Allow devices to limit the number of segments that an individual
TCP TSO packet can use at a time, to deal with device and/or driver
specific limitations. From Ben Hutchings.
3) Fix unexpected hard IPSEC expiration after setting the date. From
Fan Du.
4) Memory leak fix in bxn2x driver, from Jesper Juhl.
5) Fix two memory leaks in libertas driver, from Daniel Drake.
6) Fix deref of out-of-range array index in packet scheduler generic
actions layer. From Hiroaki SHIMODA.
7) Fix TX flow control errors in mlx4 driver, from Yevgeny Petrilin.
8) Fix CRIS eth_v10.c driver build, from Randy Dunlap.
9) Fix wrong SKB freeing in LLC protocol layer, from Sorin Dumitru.
10) The IP output path checks neigh lookup errors incorrectly, it needs
to use IS_ERR(). From Vasiliy Kulikov.
11) An estimator leak leads to deref of freed memory in timer handler,
fix from Hiroaki SHIMODA.
12) TCP early demux in ipv6 needs to use DST cookies in order to
validate the RX route properly. Fix from Eric Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
net: ipv6: fix TCP early demux
net: Use PTR_RET rather than if(IS_ERR(.. [1]
net_sched: act: Delete estimator in error path.
ip: fix error handling in ip_finish_output2()
llc: free the right skb
ixp4xx_eth: fix ptp_ixp46x build failure
drivers/atm/iphase.c: fix error return code
tcp_output: fix sparse warning for tcp_wfree
drivers/net/phy/mdio-mux-gpio.c: drop devm_kfree of devm_kzalloc'd data
batman-adv: select an internet gateway if none was chosen
mISDN: Bugfix for layer2 fixed TEI mode
igb: don't break user visible strings over multiple lines in igb_ethtool.c
igb: correct hardware type (i210/i211) check in igb_loopback_test()
igb: Fix for failure to init on some 82576 devices.
cris: fix eth_v10.c build error
cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWAN
isdnloop: fix and simplify isdnloop_init()
hyperv: Move wait completion msg code into rndis_filter_halt_device()
net/mlx4_core: Remove port type restrictions
net/mlx4_en: Fixing TX queue stop/wake flow
...
2012-08-08 20:06:43 +03:00
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: clean up con flags
2012-07-30 18:16:01 -07:00
libceph: support crush tunables
2012-07-30 18:15:23 -07:00
extcon: spelling of detach in function doc
2012-07-17 09:32:14 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
IIO channel type and modifiers for CCT and RGBC data
2012-07-10 18:49:26 +01:00
Input: add driver for FT5x06 based EDT displays
2012-07-24 23:55:03 -07:00
LockD: pass actual network namespace to grace period management functions
2012-07-27 16:49:22 -04:00
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
nfsd: Push mnt_want_write() outside of i_mutex
2012-07-31 01:02:51 +04:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-07-26 12:59:53 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
USB patches for 3.6-rc1
2012-07-26 10:23:47 -07:00
ACPI: Only count valid srat memory structures
2012-08-03 00:15:53 -04:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
fs: add link restriction audit reporting
2012-07-29 21:43:08 +04:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
2012-07-31 18:42:47 -07:00
blk: pass from_schedule to non-request unplug functions.
2012-07-31 09:08:15 +02:00
block: add partition resize function to blkpg ioctl
2012-08-01 12:24:18 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
clk: Add CLK_IS_BASIC flag to identify basic clocks
2012-07-11 15:36:43 -07:00
clk: add DT fixed-clock binding support
2012-07-11 17:58:46 -07:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
mm/compaction: cleanup on compaction_deferred
2012-07-31 18:42:42 -07:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
2012-07-30 17:25:21 -07:00
workqueue: perform cpu down operations from low priority cpu_notifier()
2012-07-17 12:39:26 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
cpusets, hotplug: Restructure functions that are invoked during hotplug
2012-07-24 13:53:22 +02:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
perf/trace: Add ability to set a target task for events
2012-07-31 17:02:05 +02:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
netvm: allow skb allocation to use PFMEMALLOC reserves
2012-07-31 18:42:46 -07:00
sched: Fix comment about PREEMPT_ACTIVE bit location
2012-07-26 13:54:58 +02:00
HID: Add suport for the brightness control keys on HP keyboards
2012-07-09 16:23:33 +02:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
2012-07-31 18:42:50 -07:00
hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
2012-07-31 18:42:41 -07:00
i2c: i2c-ocores: support for 16bit and 32bit IO
2012-07-14 13:30:25 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
init: add comments to keep initcall-names in sync with initcall levels
2012-07-27 09:29:42 +09:30
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-26 13:08:01 -07:00
random: final removal of IRQF_SAMPLE_RANDOM
2012-07-19 10:40:42 -04:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
iommu: Add missing forward declaration in include file
2012-08-03 16:04:43 +02:00
net: ipv6: fix TCP early demux
2012-08-06 13:33:21 -07:00
genirq: Allow irq chips to mark themself oneshot safe
2012-07-25 12:46:38 +02:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
irqdomain: Eliminate dedicated radix lookup functions
2012-07-11 16:16:00 +01:00
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
kdb: Remove unused KDB_FLAG_ONLY_DO_DUMP
2012-07-31 08:16:42 -05:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
2012-07-22 10:15:28 -07:00
KVM updates for the 3.6 merge window
2012-07-24 12:01:20 -07:00
leds: Rename led_brightness_set() to led_set_brightness()
2012-07-24 07:52:34 +08:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
mm: memcg: fix compaction/migration failing due to memcg limits
2012-07-31 18:42:48 -07:00
hugetlb: simplify migrate_huge_page()
2012-07-31 18:42:40 -07:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
mm: introduce __GFP_MEMALLOC to allow access to emergency reserves
2012-07-31 18:42:45 -07:00
mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage
2012-07-31 18:42:46 -07:00
new helper: done_path_create()
2012-07-29 21:24:13 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: Allow driver to limit number of GSO segments per skb
2012-08-02 00:19:17 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
irqdomain changes for Linux v3.6
2012-07-31 20:44:03 -07:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
Platform: OLPC: turn EC driver into a platform_driver
2012-07-31 23:27:30 -04:00
dmaengine: add OMAP DMA engine driver
2012-07-31 12:06:20 +01:00
mm, memcg: move all oom handling to memcontrol.c
2012-07-31 18:42:45 -07:00
mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages
2012-07-31 18:42:45 -07:00
mm: factor out memory isolate functions
2012-07-31 18:42:45 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: methods for teaching filesystems about PG_swapcache pages
2012-07-31 18:42:47 -07:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
perf/trace: Add ability to set a target task for events
2012-07-31 17:02:05 +02:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
2012-07-13 20:41:58 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
pstore: Headers should include all stuff they use
2012-07-17 12:15:30 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
pwm-backlight: Add rudimentary device tree support
2012-07-23 13:23:52 +02:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
remoteproc: Support custom firmware handlers
2012-07-15 11:39:01 +03:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
mm: allow PF_MEMALLOC from softirq context
2012-07-31 18:42:45 -07:00
serial/8250: Add LPC3220 standard UART type
2012-07-26 13:37:02 -07:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
sh: pfc: Rudimentary pinctrl-backed GPIO support.
2012-07-10 12:08:14 +09:00
dmaengine: shdma: restore partial transfer calculation
2012-08-01 13:48:52 +09:00
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
vmscan: remove obsolete shrink_control comment
2012-07-31 18:42:43 -07:00
netvm: propagate page->pfmemalloc from skb_alloc_page to skb
2012-07-31 18:42:46 -07:00
mm, sl[aou]b: Common definition for boot state of the slab allocators
2012-07-09 12:13:35 +03:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
mm: swap: implement generic handler for swap_activate
2012-07-31 18:42:47 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
sched/numa: Add SD_PERFER_SIBLING to CPU domain
2012-07-26 11:46:58 +02:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
2012-07-16 17:43:04 -07:00
[SCSI] usb-storage: add support for write cache quirk
2012-07-20 08:59:00 +01:00
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
[media] v4l2: Add rangelow and rangehigh fields to the v4l2_hw_freq_seek struct
2012-07-30 20:23:11 -03:00
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
mm: account for the number of times direct reclaimers get throttled
2012-07-31 18:42:46 -07:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
mm: remove redundant initialization
2012-07-31 18:42:50 -07:00
vfs: nuke pdflush from comments
2012-08-04 12:15:37 +04:00
