From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Feb 2014 00:42:23 +0000 (+0100)
Subject: Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
X-Git-Tag: v3.4.79~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=594f83d07204f03e6a75ea0ad9eaf4ac528b2151;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
---

594f83d07204f03e6a75ea0ad9eaf4ac528b2151
diff --cc queue-3.10/series
index 70e137a4267,4a98ae1204e..89c9a2ceafb
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@@ -73,4 -69,34 +69,35 @@@ ext4-avoid-clearing-beyond-i_blocks-whe
  vfs-is-mounted-should-be-testing-mnt_ns-for-null-or-error.patch
  bcache-data-corruption-fix.patch
  hp_accel-add-a-new-pnp-id-hpq6007-for-new-hp-laptops.patch
+ bnx2x-fix-dma-unmapping-of-tso-split-bds.patch
+ inet_diag-fix-inet_diag_dump_icsk-timewait-socket-state-logic.patch
+ ieee802154-fix-memory-leak-in-ieee802154_add_iface.patch
+ net-avoid-reference-counter-overflows-on-fib_rules-in-multicast-forwarding.patch
+ net-via-rhine-fix-tx_timeout-handling.patch
+ net-rds-fix-per-cpu-helper-usage.patch
+ tcp-metrics-avoid-duplicate-entries-with-the-same-destination-ip.patch
+ bpf-do-not-use-reciprocal-divide.patch
+ s390-bpf-jit-fix-32-bit-divisions-use-unsigned-divide-instructions.patch
+ ip_tunnel-clear-ipcb-in-ip_tunnel_xmit-in-case-dst_link_failure-is-called.patch
+ fib_frontend-fix-possible-null-pointer-dereference.patch
+ net-fix-memory-leak-if-tproxy-used-with-tcp-early-demux.patch
+ xen-netfront-fix-resource-leak-in-netfront.patch
+ sit-fix-double-free-of-fb_tunnel_dev-on-exit.patch
+ revert-ip6tnl-fix-use-after-free-of-fb_tnl_dev.patch
+ ip6tnl-fix-double-free-of-fb_tnl_dev-on-exit.patch
+ iwlwifi-pcie-enable-oscillator-for-l1-exit.patch
+ parisc-fix-cache-flushing.patch
+ kvm-ppc-book3s-hv-use-xics_wake_cpu-only-when-defined.patch
+ kvm-ppc-e500-fix-bad-address-type-in-deliver_tlb_misss.patch
+ alsa-hda-hdmi-introduce-patch_nvhdmi.patch
+ alsa-hda-hdmi-allow-pin_out-to-be-dynamically-enabled.patch
+ iwlwifi-pcie-fix-interrupt-coalescing-for-7260-3160.patch
+ usb-core-get-config-and-string-descriptors-for-unauthorized-devices.patch
+ scsi-bfa-chinook-quad-port-16g-fc-hba-claim-issue.patch
+ virtio-scsi-fix-hotcpu_notifier-use-after-free-with-virtscsi_freeze.patch
+ target-iscsi-fix-network-portal-creation-race.patch
+ btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch
+ btrfs-restrict-snapshotting-to-own-subvolumes.patch
+ powerpc-fix-the-setup-of-cpu-to-node-mappings-during-cpu-online.patch
+ powerpc-make-sure-cache-directory-is-removed-when-offlining-cpu.patch
 +x86-cpu-amd-add-workaround-for-family-16h-erratum-793.patch
diff --cc queue-3.12/series
index 792792d62aa,2aecdf47b4b..d2ba3595061
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@@ -99,4 -96,36 +96,37 @@@ arm-mvebu-add-quirk-for-i2c-for-the-ope
  i2c-mv64xxx-fix-bus-hang-on-a0-version-of-the-armada-xp-socs.patch
  i2c-mv64xxx-document-the-newly-introduced-armada-xp-a0-compatible.patch
  i2c-piix4-add-support-for-amd-ml-and-cz-smbus-changes.patch
+ bnx2x-fix-dma-unmapping-of-tso-split-bds.patch
+ net-usbnet-fix-sg-initialisation.patch
+ ieee802154-fix-memory-leak-in-ieee802154_add_iface.patch
+ net-avoid-reference-counter-overflows-on-fib_rules-in-multicast-forwarding.patch
+ net-via-rhine-fix-tx_timeout-handling.patch
+ net-rds-fix-per-cpu-helper-usage.patch
+ tcp-metrics-avoid-duplicate-entries-with-the-same-destination-ip.patch
+ bpf-do-not-use-reciprocal-divide.patch
+ s390-bpf-jit-fix-32-bit-divisions-use-unsigned-divide-instructions.patch
+ ip_tunnel-clear-ipcb-in-ip_tunnel_xmit-in-case-dst_link_failure-is-called.patch
+ net-vxlan-share-rx-skb-de-marking-and-checksum-checks-with-ovs.patch
+ fib_frontend-fix-possible-null-pointer-dereference.patch
+ net-fix-memory-leak-if-tproxy-used-with-tcp-early-demux.patch
+ xen-netfront-fix-resource-leak-in-netfront.patch
+ net-gre-use-icmp_hdr-to-get-inner-ip-header.patch
+ inet_diag-fix-inet_diag_dump_icsk-timewait-socket-state-logic.patch
+ alpha-fix-broken-network-checksum.patch
+ parisc-fix-cache-flushing.patch
+ kvm-ppc-book3s-hv-use-xics_wake_cpu-only-when-defined.patch
+ kvm-ppc-e500-fix-bad-address-type-in-deliver_tlb_misss.patch
+ alsa-hda-don-t-set-indep_hp-flag-for-old-ad-codecs.patch
+ alsa-hda-hdmi-introduce-patch_nvhdmi.patch
+ alsa-hda-hdmi-allow-pin_out-to-be-dynamically-enabled.patch
+ hpfs-remember-free-space.patch
+ usb-core-get-config-and-string-descriptors-for-unauthorized-devices.patch
+ scsi-bfa-chinook-quad-port-16g-fc-hba-claim-issue.patch
+ virtio-scsi-fix-hotcpu_notifier-use-after-free-with-virtscsi_freeze.patch
+ iscsi-target-pre-allocate-more-tags-to-avoid-ack-starvation.patch
+ target-iscsi-fix-network-portal-creation-race.patch
+ btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch
+ btrfs-restrict-snapshotting-to-own-subvolumes.patch
+ powerpc-fix-the-setup-of-cpu-to-node-mappings-during-cpu-online.patch
+ powerpc-make-sure-cache-directory-is-removed-when-offlining-cpu.patch
 +x86-cpu-amd-add-workaround-for-family-16h-erratum-793.patch
diff --cc queue-3.13/series
index de69c70d980,44e473469f7..a99f2abd7ab
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@@ -109,4 -107,32 +107,33 @@@ arm-mvebu-add-quirk-for-i2c-for-the-ope
  i2c-mv64xxx-fix-bus-hang-on-a0-version-of-the-armada-xp-socs.patch
  i2c-mv64xxx-document-the-newly-introduced-armada-xp-a0-compatible.patch
  i2c-piix4-add-support-for-amd-ml-and-cz-smbus-changes.patch
+ drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch
+ ip_tunnel-clear-ipcb-in-ip_tunnel_xmit-in-case-dst_link_failure-is-called.patch
+ net-vxlan-share-rx-skb-de-marking-and-checksum-checks-with-ovs.patch
+ fib_frontend-fix-possible-null-pointer-dereference.patch
+ net-fix-memory-leak-if-tproxy-used-with-tcp-early-demux.patch
+ xen-netfront-fix-resource-leak-in-netfront.patch
+ net-gre-use-icmp_hdr-to-get-inner-ip-header.patch
+ mmc-sdhci-add-quirk-for-broken-hs200-support.patch
+ mmc-sdhci-pci-add-broken-hs200-quirk-for-intel-merrifield.patch
+ mmc-sdhci-fix-lockdep-error-in-tuning-routine.patch
+ mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
+ alpha-fix-broken-network-checksum.patch
+ parisc-sti_console-prefer-linux-fonts-over-built-in-rom-fonts.patch
+ parisc-fix-cache-flushing.patch
+ kvm-ppc-book3s-hv-use-xics_wake_cpu-only-when-defined.patch
+ kvm-ppc-e500-fix-bad-address-type-in-deliver_tlb_misss.patch
+ alsa-hda-don-t-set-indep_hp-flag-for-old-ad-codecs.patch
+ hpfs-remember-free-space.patch
+ usb-core-get-config-and-string-descriptors-for-unauthorized-devices.patch
+ scsi-bfa-chinook-quad-port-16g-fc-hba-claim-issue.patch
+ scsi-qla4xxx-overflow-in-qla4xxx_set_chap_entry.patch
+ virtio-scsi-fix-hotcpu_notifier-use-after-free-with-virtscsi_freeze.patch
+ iscsi-target-pre-allocate-more-tags-to-avoid-ack-starvation.patch
+ target-iscsi-fix-network-portal-creation-race.patch
+ btrfs-handle-eagain-case-properly-in-btrfs_drop_snapshot.patch
+ btrfs-setup-inode-location-during-btrfs_init_inode_locked.patch
+ btrfs-restrict-snapshotting-to-own-subvolumes.patch
+ powerpc-fix-the-setup-of-cpu-to-node-mappings-during-cpu-online.patch
+ powerpc-make-sure-cache-directory-is-removed-when-offlining-cpu.patch
 +x86-cpu-amd-add-workaround-for-family-16h-erratum-793.patch